Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test

on:
pull_request:
branches: [develop]
branches: [develop, ql-dev]
paths-ignore:
- "**/README.md"

Expand Down
4 changes: 2 additions & 2 deletions clients/apiextensions/func.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/iotaledger/wasp/v2/clients/apiclient"
"github.com/iotaledger/wasp/v2/clients/iota-go/iotajsonrpc"
"github.com/iotaledger/wasp/v2/clients/iotagraphql"
"github.com/iotaledger/wasp/v2/clients/iscmove"
"github.com/iotaledger/wasp/v2/packages/cryptolib"
"github.com/iotaledger/wasp/v2/packages/isc"
Expand Down Expand Up @@ -49,7 +49,7 @@ func APIResultToCallArgs(res []string) (isc.CallResults, error) {
return APIArgsToCallArgs(res)
}

func APIWaitUntilAllRequestsProcessed(ctx context.Context, client *apiclient.APIClient, tx *iotajsonrpc.IotaTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
func APIWaitUntilAllRequestsProcessed(ctx context.Context, client *apiclient.APIClient, tx *iotagraphql.IotaTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
req, err := tx.GetCreatedObjectByName(iscmove.RequestModuleName, iscmove.RequestObjectName)
if err != nil {
return nil, err
Expand Down
21 changes: 10 additions & 11 deletions clients/chainclient/chainclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import (
"github.com/iotaledger/wasp/v2/clients"
"github.com/iotaledger/wasp/v2/clients/apiclient"
"github.com/iotaledger/wasp/v2/clients/apiextensions"
"github.com/iotaledger/wasp/v2/clients/iota-go/iotaclient"
"github.com/iotaledger/wasp/v2/clients/iota-go/iotago"
"github.com/iotaledger/wasp/v2/clients/iota-go/iotajsonrpc"
"github.com/iotaledger/wasp/v2/clients/iotagraphql"
"github.com/iotaledger/wasp/v2/clients/iscmove"
"github.com/iotaledger/wasp/v2/clients/iscmove/iscmoveclient"
"github.com/iotaledger/wasp/v2/packages/coin"
Expand Down Expand Up @@ -84,7 +83,7 @@ func (par *PostRequestParams) GetGasBudget() uint64 {

func (par *PostRequestParams) GetGasPrice() uint64 {
if par.GasPrice == 0 {
return iotaclient.DefaultGasPrice
return iotagraphql.DefaultGasPrice
}
return par.GasPrice
}
Expand All @@ -108,7 +107,7 @@ func (c *Client) PostRequest(
ctx context.Context,
msg isc.Message,
param PostRequestParams,
) (*iotajsonrpc.IotaTransactionBlockResponse, error) {
) (*iotagraphql.IotaTransactionBlockResponse, error) {
if param.GasBudget == 0 {
return nil, fmt.Errorf("GasBudget is empty")
}
Expand All @@ -121,9 +120,9 @@ func (c *Client) PostMultipleRequests(
msg isc.Message,
requestsCount int,
params ...PostRequestParams,
) ([]*iotajsonrpc.IotaTransactionBlockResponse, error) {
) ([]*iotagraphql.IotaTransactionBlockResponse, error) {
var err error
txRes := make([]*iotajsonrpc.IotaTransactionBlockResponse, requestsCount)
txRes := make([]*iotagraphql.IotaTransactionBlockResponse, requestsCount)
for i := range requestsCount {
txRes[i], err = c.postSingleRequest(ctx, msg, params[i])
if err != nil {
Expand All @@ -137,11 +136,11 @@ func (c *Client) postSingleRequest(
ctx context.Context,
iscmsg isc.Message,
params PostRequestParams,
) (*iotajsonrpc.IotaTransactionBlockResponse, error) {
) (*iotagraphql.IotaTransactionBlockResponse, error) {
transferAssets := iscmove.NewAssets(0)
if params.Transfer != nil {
for coinType, coinbal := range params.Transfer.Coins.Iterate() {
transferAssets.SetCoin(iotajsonrpc.MustCoinTypeFromString(coinType.String()), iotajsonrpc.CoinValue(coinbal.Uint64()))
transferAssets.SetCoin(iotagraphql.MustCoinTypeFromString(coinType.String()), iotagraphql.CoinValue(coinbal.Uint64()))
}
}
msg := &iscmove.Message{
Expand Down Expand Up @@ -233,19 +232,19 @@ func (c *Client) PostOffLedgerRequest(
return signed, err
}

func (c *Client) DepositFunds(n coin.Value) (*iotajsonrpc.IotaTransactionBlockResponse, error) {
func (c *Client) DepositFunds(n coin.Value) (*iotagraphql.IotaTransactionBlockResponse, error) {
return c.PostRequest(context.Background(), accounts.FuncDeposit.Message(), PostRequestParams{
Transfer: isc.NewAssets(n),
Allowance: isc.NewAssets(n),
GasBudget: iotaclient.DefaultGasBudget,
GasBudget: iotagraphql.DefaultGasBudget,
})
}

func NewPostRequestParams() *PostRequestParams {
return &PostRequestParams{
Transfer: isc.NewEmptyAssets(),
Allowance: isc.NewEmptyAssets(),
GasBudget: iotaclient.DefaultGasBudget,
GasBudget: iotagraphql.DefaultGasBudget,
}
}

Expand Down
203 changes: 0 additions & 203 deletions clients/iota-go/client/interface.go

This file was deleted.

3 changes: 2 additions & 1 deletion clients/iota-go/hw_ledger/ledger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
ledger_go "github.com/iotaledger/wasp/v2/clients/iota-go/hw_ledger/ledger-go"
"github.com/iotaledger/wasp/v2/clients/iota-go/iotaconn"
"github.com/iotaledger/wasp/v2/clients/iota-go/iotasigner"
"github.com/iotaledger/wasp/v2/clients/iotagraphql"
)

func initializeLedger(t *testing.T) *HWLedger {
Expand Down Expand Up @@ -65,7 +66,7 @@ func TestDeployChain(t *testing.T) {
APIURL: iotaconn.AlphanetEndpointURL,
FaucetURL: iotaconn.AlphanetFaucetURL,
},
iotaclient.WaitForEffectsEnabled,
iotagraphql.WaitForEffectsEnabled,
)

pubKey, err := dev.GetPublicKey("44'/4218'/123'/0'/0'", false)
Expand Down
67 changes: 0 additions & 67 deletions clients/iota-go/iotaclient/api_coin_query.go

This file was deleted.

Loading
Loading