From 02e0c1a69817cdb1db566b28775a3fb260c49eaa Mon Sep 17 00:00:00 2001 From: linhpn99 Date: Mon, 26 Aug 2024 22:03:03 +0700 Subject: [PATCH] solve conflict --- gno.land/pkg/gnoclient/client.go | 2 +- gno.land/pkg/gnoclient/client_txs.go | 9 +- gno.land/pkg/gnoclient/client_txs_test.go | 158 +++++++++++++++------ gno.land/pkg/gnoclient/integration_test.go | 102 ++----------- 4 files changed, 134 insertions(+), 137 deletions(-) diff --git a/gno.land/pkg/gnoclient/client.go b/gno.land/pkg/gnoclient/client.go index b9882217742..847526f4df5 100644 --- a/gno.land/pkg/gnoclient/client.go +++ b/gno.land/pkg/gnoclient/client.go @@ -32,7 +32,7 @@ type IClient interface { AddPackage(cfg BaseTxCfg, msgs ...vm.MsgAddPackage) (*ctypes.ResultBroadcastTxCommit, error) SignTx(tx std.Tx, accountNumber, sequenceNumber uint64) (*std.Tx, error) - BroadcastTxCommit(signedTx *std.Tx) (*ctypes.ResultBroadcastTxCommit, error) + BroadcastTx(signedTx *std.Tx) (*ctypes.ResultBroadcastTxCommit, error) NewSponsorTransaction(cfg SponsorTxCfg, msgs ...std.Msg) (*std.Tx, error) ExecuteSponsorTransaction(tx std.Tx, accountNumber, sequenceNumber uint64) (*ctypes.ResultBroadcastTxCommit, error) diff --git a/gno.land/pkg/gnoclient/client_txs.go b/gno.land/pkg/gnoclient/client_txs.go index b8d26cc57d3..55965c55f1a 100644 --- a/gno.land/pkg/gnoclient/client_txs.go +++ b/gno.land/pkg/gnoclient/client_txs.go @@ -68,6 +68,7 @@ func (c *Client) Run(cfg BaseTxCfg, msgs ...vm.MsgRun) (*ctypes.ResultBroadcastT if err != nil { return nil, err } + return c.signAndBroadcastTxCommit(*tx, cfg.AccountNumber, cfg.SequenceNumber) } @@ -115,6 +116,7 @@ func (c *Client) Send(cfg BaseTxCfg, msgs ...bank.MsgSend) (*ctypes.ResultBroadc if err != nil { return nil, err } + return c.signAndBroadcastTxCommit(*tx, cfg.AccountNumber, cfg.SequenceNumber) } @@ -162,6 +164,7 @@ func (c *Client) AddPackage(cfg BaseTxCfg, msgs ...vm.MsgAddPackage) (*ctypes.Re if err != nil { return nil, err } + return c.signAndBroadcastTxCommit(*tx, cfg.AccountNumber, cfg.SequenceNumber) } @@ -300,12 +303,12 @@ func (c *Client) signAndBroadcastTxCommit(tx std.Tx, accountNumber, sequenceNumb if err != nil { return nil, err } - return c.BroadcastTxCommit(signedTx) + return c.BroadcastTx(signedTx) } -// BroadcastTxCommit marshals and broadcasts the signed transaction, returning the result. +// BroadcastTx marshals and broadcasts the signed transaction, returning the result. // If the result has a delivery error, then return a wrapped error. -func (c *Client) BroadcastTxCommit(signedTx *std.Tx) (*ctypes.ResultBroadcastTxCommit, error) { +func (c *Client) BroadcastTx(signedTx *std.Tx) (*ctypes.ResultBroadcastTxCommit, error) { if err := c.validateRPCClient(); err != nil { return nil, err } diff --git a/gno.land/pkg/gnoclient/client_txs_test.go b/gno.land/pkg/gnoclient/client_txs_test.go index 2e77626c442..38c479131fb 100644 --- a/gno.land/pkg/gnoclient/client_txs_test.go +++ b/gno.land/pkg/gnoclient/client_txs_test.go @@ -26,7 +26,8 @@ var ( func TestRender(t *testing.T) { t.Parallel() testRealmPath := "gno.land/r/demo/deep/very/deep" - expectedRender := []byte("it works!") + + expectedRender := []byte("hi gnoclient!\n") client := Client{ Signer: &mockSigner{ @@ -66,6 +67,8 @@ func TestRender(t *testing.T) { func TestCallSingle(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -84,7 +87,7 @@ func TestCallSingle(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("it works!"), + Data: []byte(expected), }, }, } @@ -117,12 +120,19 @@ func TestCallSingle(t *testing.T) { res, err := client.Call(cfg, msg...) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "it works!") + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = callSigningSeparately(t, client, cfg, msg...) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestCallSingle_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -142,7 +152,7 @@ func TestCallSingle_Sponsor(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("it works!"), + Data: []byte(expected), }, }, } @@ -182,12 +192,14 @@ func TestCallSingle_Sponsor(t *testing.T) { res, err := client.ExecuteSponsorTransaction(*presignedTx, cfg.AccountNumber, cfg.SequenceNumber) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "it works!") + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestCallMultiple(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -204,13 +216,9 @@ func TestCallMultiple(t *testing.T) { RPCClient: &mockRPCClient{ broadcastTxCommit: func(tx types.Tx) (*ctypes.ResultBroadcastTxCommit, error) { res := &ctypes.ResultBroadcastTxCommit{ - CheckTx: abci.ResponseCheckTx{ + DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Error: nil, - Data: nil, - Events: nil, - Log: "", - Info: "", + Data: []byte(expected), }, }, } @@ -258,11 +266,19 @@ func TestCallMultiple(t *testing.T) { res, err := client.Call(cfg, msg...) assert.NoError(t, err) assert.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = callSigningSeparately(t, client, cfg, msg...) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestCallMultiple_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -282,7 +298,7 @@ func TestCallMultiple_Sponsor(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("it works!"), + Data: []byte(expected), }, }, } @@ -339,7 +355,7 @@ func TestCallMultiple_Sponsor(t *testing.T) { assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "it works!") + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestCallErrors(t *testing.T) { @@ -535,6 +551,8 @@ func TestCallErrors(t *testing.T) { func TestSendSingle(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -553,7 +571,7 @@ func TestSendSingle(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("it works!"), + Data: []byte(expected), }, }, } @@ -586,12 +604,19 @@ func TestSendSingle(t *testing.T) { res, err := client.Send(cfg, msg...) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "it works!") + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = sendSigningSeparately(t, client, cfg, msg...) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestSendSingle_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -611,7 +636,7 @@ func TestSendSingle_Sponsor(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("it works!"), + Data: []byte(expected), }, }, } @@ -651,12 +676,14 @@ func TestSendSingle_Sponsor(t *testing.T) { res, err := client.ExecuteSponsorTransaction(*presignedTx, cfg.AccountNumber, cfg.SequenceNumber) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "it works!") + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestSendMultiple(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -675,7 +702,7 @@ func TestSendMultiple(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("it works!"), + Data: []byte(expected), }, }, } @@ -710,12 +737,19 @@ func TestSendMultiple(t *testing.T) { res, err := client.Send(cfg, msg1, msg2) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "it works!") + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = sendSigningSeparately(t, client, cfg, msg1, msg2) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestSendMultiple_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -735,7 +769,7 @@ func TestSendMultiple_Sponsor(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("it works!"), + Data: []byte(expected), }, }, } @@ -782,7 +816,7 @@ func TestSendMultiple_Sponsor(t *testing.T) { assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "it works!") + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestSendErrors(t *testing.T) { @@ -983,6 +1017,8 @@ func TestSendErrors(t *testing.T) { func TestRunSingle(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1001,7 +1037,7 @@ func TestRunSingle(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("hi gnoclient!\n"), + Data: []byte(expected), }, }, } @@ -1047,12 +1083,19 @@ func main() { res, err := client.Run(cfg, msg) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = runSigningSeparately(t, client, cfg, msg) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestRunSingle_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1128,12 +1171,14 @@ func main() { assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestRunMultiple(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1152,7 +1197,7 @@ func TestRunMultiple(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("hi gnoclient!\nhi gnoclient!\n"), + Data: []byte(expected), }, }, } @@ -1211,12 +1256,19 @@ func main() { res, err := client.Run(cfg, msg1, msg2) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\nhi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = runSigningSeparately(t, client, cfg, msg1, msg2) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestRunMultiple_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1236,7 +1288,7 @@ func TestRunMultiple_Sponsor(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("hi gnoclient!\nhi gnoclient!\n"), + Data: []byte(expected), }, }, } @@ -1305,7 +1357,7 @@ func main() { assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\nhi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestRunErrors(t *testing.T) { @@ -1509,6 +1561,8 @@ func TestRunErrors(t *testing.T) { func TestAddPackageSingle(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1527,7 +1581,7 @@ func TestAddPackageSingle(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("hi gnoclient!\n"), + Data: []byte(expected), }, }, } @@ -1565,12 +1619,19 @@ func TestAddPackageSingle(t *testing.T) { res, err := client.AddPackage(cfg, msg) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = addPackageSigningSeparately(t, client, cfg, msg) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestAddPackageSingle_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1590,7 +1651,7 @@ func TestAddPackageSingle_Sponsor(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("hi gnoclient!\n"), + Data: []byte(expected), }, }, } @@ -1638,12 +1699,14 @@ func TestAddPackageSingle_Sponsor(t *testing.T) { assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestAddPackageMultiple(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1662,7 +1725,7 @@ func TestAddPackageMultiple(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("hi gnoclient!\n"), + Data: []byte(expected), }, }, } @@ -1716,12 +1779,19 @@ func TestAddPackageMultiple(t *testing.T) { res, err := client.AddPackage(cfg, msgs...) assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) + + res, err = addPackageSigningSeparately(t, client, cfg, msgs...) + assert.NoError(t, err) + require.NotNil(t, res) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestAddPackageMultiple_Sponsor(t *testing.T) { t.Parallel() + expected := "hi gnoclient!\n" + client := Client{ Signer: &mockSigner{ sign: func(cfg SignCfg) (*std.Tx, error) { @@ -1741,7 +1811,7 @@ func TestAddPackageMultiple_Sponsor(t *testing.T) { res := &ctypes.ResultBroadcastTxCommit{ DeliverTx: abci.ResponseDeliverTx{ ResponseBase: abci.ResponseBase{ - Data: []byte("hi gnoclient!\n"), + Data: []byte(expected), }, }, } @@ -1804,7 +1874,7 @@ func TestAddPackageMultiple_Sponsor(t *testing.T) { assert.NoError(t, err) require.NotNil(t, res) - assert.Equal(t, "hi gnoclient!\n", string(res.DeliverTx.Data)) + assert.Equal(t, expected, string(res.DeliverTx.Data)) } func TestAddPackageErrors(t *testing.T) { @@ -2208,12 +2278,12 @@ func TestNewSponsorTransaction(t *testing.T) { res, err := tc.client.NewSponsorTransaction(tc.cfg, tc.msgs...) assert.Nil(t, res) - assert.Equal(t, err.Error(), tc.expectedError.Error()) + assert.Equal(t, tc.expectedError.Error(), err.Error()) }) } } -func TestSignTransaction(t *testing.T) { +func TestSignTx(t *testing.T) { t.Parallel() testCases := []struct { @@ -2264,7 +2334,7 @@ func TestSignTransaction(t *testing.T) { res, err := tc.client.SignTx(tc.tx, 0, 0) assert.Nil(t, res) - assert.Equal(t, err.Error(), tc.expectedError.Error()) + assert.Equal(t, tc.expectedError.Error(), err.Error()) }) } } @@ -2392,7 +2462,7 @@ func TestExecuteSponsorTransaction(t *testing.T) { res, err := tc.client.ExecuteSponsorTransaction(tc.tx, 0, 0) assert.Nil(t, res) - assert.Equal(t, err.Error(), tc.expectedError.Error()) + assert.Equal(t, tc.expectedError.Error(), err.Error()) }) } } @@ -2406,7 +2476,7 @@ func callSigningSeparately(t *testing.T, client Client, cfg BaseTxCfg, msgs ...v signedTx, err := client.SignTx(*tx, cfg.AccountNumber, cfg.SequenceNumber) assert.NoError(t, err) require.NotNil(t, signedTx) - res, err := client.BroadcastTxCommit(signedTx) + res, err := client.BroadcastTx(signedTx) assert.NoError(t, err) require.NotNil(t, res) return res, nil @@ -2421,7 +2491,7 @@ func runSigningSeparately(t *testing.T, client Client, cfg BaseTxCfg, msgs ...vm signedTx, err := client.SignTx(*tx, cfg.AccountNumber, cfg.SequenceNumber) assert.NoError(t, err) require.NotNil(t, signedTx) - res, err := client.BroadcastTxCommit(signedTx) + res, err := client.BroadcastTx(signedTx) assert.NoError(t, err) require.NotNil(t, res) return res, nil @@ -2436,7 +2506,7 @@ func sendSigningSeparately(t *testing.T, client Client, cfg BaseTxCfg, msgs ...b signedTx, err := client.SignTx(*tx, cfg.AccountNumber, cfg.SequenceNumber) assert.NoError(t, err) require.NotNil(t, signedTx) - res, err := client.BroadcastTxCommit(signedTx) + res, err := client.BroadcastTx(signedTx) assert.NoError(t, err) require.NotNil(t, res) return res, nil @@ -2451,7 +2521,7 @@ func addPackageSigningSeparately(t *testing.T, client Client, cfg BaseTxCfg, msg signedTx, err := client.SignTx(*tx, cfg.AccountNumber, cfg.SequenceNumber) assert.NoError(t, err) require.NotNil(t, signedTx) - res, err := client.BroadcastTxCommit(signedTx) + res, err := client.BroadcastTx(signedTx) assert.NoError(t, err) require.NotNil(t, res) return res, nil diff --git a/gno.land/pkg/gnoclient/integration_test.go b/gno.land/pkg/gnoclient/integration_test.go index 36774f803e2..f9bac6368ca 100644 --- a/gno.land/pkg/gnoclient/integration_test.go +++ b/gno.land/pkg/gnoclient/integration_test.go @@ -43,7 +43,7 @@ func TestCallSingle_Integration(t *testing.T) { // Make Tx config baseCfg := BaseTxCfg{ - GasFee: "10000ugnot", + GasFee: ugnot.ValueString(10000), GasWanted: 8000000, AccountNumber: 0, SequenceNumber: 0, @@ -70,11 +70,6 @@ func TestCallSingle_Integration(t *testing.T) { got := string(res.DeliverTx.Data) assert.Equal(t, expected, got) - - res, err = callSigningSeparately(t, client, baseCfg, msg) - require.NoError(t, err) - got = string(res.DeliverTx.Data) - assert.Equal(t, expected, got) } func TestCallSingle_Sponsor_Integration(t *testing.T) { @@ -125,7 +120,7 @@ func TestCallSingle_Sponsor_Integration(t *testing.T) { cfg := SponsorTxCfg{ BaseTxCfg: BaseTxCfg{ GasWanted: 100000, - GasFee: "10000ugnot", + GasFee: ugnot.ValueString(10000), Memo: "Test memo", }, SponsorAddress: sponsorInfo.GetAddress(), @@ -194,7 +189,7 @@ func TestCallMultiple_Integration(t *testing.T) { // Make Tx config baseCfg := BaseTxCfg{ - GasFee: "10000ugnot", + GasFee: ugnot.ValueString(10000), GasWanted: 8000000, AccountNumber: 0, SequenceNumber: 0, @@ -230,11 +225,6 @@ func TestCallMultiple_Integration(t *testing.T) { got := string(res.DeliverTx.Data) assert.Equal(t, expected, got) - - res, err = callSigningSeparately(t, client, baseCfg, msg1, msg2) - require.NoError(t, err) - got = string(res.DeliverTx.Data) - assert.Equal(t, expected, got) } func TestSendSingle_Integration(t *testing.T) { @@ -289,17 +279,6 @@ func TestSendSingle_Integration(t *testing.T) { got := account.GetCoins() assert.Equal(t, expected, got) - - res, err = sendSigningSeparately(t, client, baseCfg, msg) - require.NoError(t, err) - assert.Equal(t, "", string(res.DeliverTx.Data)) - - // Get the new account balance - account, _, err = client.QueryAccount(toAddress) - require.NoError(t, err) - expected2 := std.Coins{{Denom: ugnot.Denom, Amount: int64(2 * amount)}} - got = account.GetCoins() - assert.Equal(t, expected2, got) } func TestSendSingle_Sponsor_Integration(t *testing.T) { @@ -339,7 +318,7 @@ func TestSendSingle_Sponsor_Integration(t *testing.T) { // Ensure sender has enough money to make msg send _, err = sponsorClient.Send(BaseTxCfg{ GasWanted: 1000000, - GasFee: "100000ugnot", + GasFee: ugnot.ValueString(100000), Memo: "Test memo", }, bank.MsgSend{ FromAddress: sponsorInfo.GetAddress(), @@ -362,7 +341,7 @@ func TestSendSingle_Sponsor_Integration(t *testing.T) { cfg := SponsorTxCfg{ BaseTxCfg: BaseTxCfg{ GasWanted: 1000000, - GasFee: "100000ugnot", + GasFee: ugnot.ValueString(100000), Memo: "Test memo", }, SponsorAddress: sponsorInfo.GetAddress(), @@ -479,17 +458,6 @@ func TestSendMultiple_Integration(t *testing.T) { got := account.GetCoins() assert.Equal(t, expected, got) - - res, err = sendSigningSeparately(t, client, baseCfg, msg1, msg2) - require.NoError(t, err) - assert.Equal(t, "", string(res.DeliverTx.Data)) - - // Get the new account balance - account, _, err = client.QueryAccount(toAddress) - require.NoError(t, err) - expected2 := std.Coins{{Denom: ugnot.Denom, Amount: int64(2 * (amount1 + amount2))}} - got = account.GetCoins() - assert.Equal(t, expected2, got) } func TestSendMultiple_Sponsor_Integration(t *testing.T) { @@ -529,7 +497,7 @@ func TestSendMultiple_Sponsor_Integration(t *testing.T) { // Ensure sender has enough money to make msg send _, err = sponsorClient.Send(BaseTxCfg{ GasWanted: 1000000, - GasFee: "100000ugnot", + GasFee: ugnot.ValueString(100000), Memo: "Test memo", }, bank.MsgSend{ FromAddress: sponsorInfo.GetAddress(), @@ -552,7 +520,7 @@ func TestSendMultiple_Sponsor_Integration(t *testing.T) { cfg := SponsorTxCfg{ BaseTxCfg: BaseTxCfg{ GasWanted: 1000000, - GasFee: "100000ugnot", + GasFee: ugnot.ValueString(100000), Memo: "Test memo", }, SponsorAddress: sponsorInfo.GetAddress(), @@ -679,11 +647,6 @@ func main() { assert.NoError(t, err) require.NotNil(t, res) assert.Equal(t, string(res.DeliverTx.Data), "- before: 0\n- after: 10\n") - - res, err = runSigningSeparately(t, client, baseCfg, msg) - assert.NoError(t, err) - require.NotNil(t, res) - assert.Equal(t, string(res.DeliverTx.Data), "- before: 10\n- after: 20\n") } func TestRunSingle_Sponsor_Integration(t *testing.T) { @@ -733,7 +696,7 @@ func TestRunSingle_Sponsor_Integration(t *testing.T) { // Configure the transaction to be sponsored cfg := SponsorTxCfg{ BaseTxCfg: BaseTxCfg{ - GasFee: "10000ugnot", + GasFee: ugnot.ValueString(10000), GasWanted: 8000000, Memo: "", }, @@ -888,12 +851,6 @@ func main() { assert.NoError(t, err) require.NotNil(t, res) assert.Equal(t, expected, string(res.DeliverTx.Data)) - - res, err = runSigningSeparately(t, client, baseCfg, msg1, msg2) - require.NoError(t, err) - require.NotNil(t, res) - expected2 := "- before: 10\n- after: 20\nhi gnoclient!\n" - assert.Equal(t, expected2, string(res.DeliverTx.Data)) } func TestRunMultiple_Sponsor_Integration(t *testing.T) { @@ -943,7 +900,7 @@ func TestRunMultiple_Sponsor_Integration(t *testing.T) { // Configure the transaction to be sponsored cfg := SponsorTxCfg{ BaseTxCfg: BaseTxCfg{ - GasFee: "10000ugnot", + GasFee: ugnot.ValueString(10000), GasWanted: 8000000, Memo: "", }, @@ -1108,18 +1065,6 @@ func Echo(str string) string { baseAcc, _, err := client.QueryAccount(gnolang.DerivePkgAddr(deploymentPath)) require.NoError(t, err) assert.Equal(t, baseAcc.GetCoins(), deposit) - - // Test signing separately (using a different deployment path) - deploymentPathB := "gno.land/p/demo/integration/test/echo2" - msg.Package.Path = deploymentPathB - _, err = addPackageSigningSeparately(t, client, baseCfg, msg) - assert.NoError(t, err) - query, err = client.Query(QueryCfg{ - Path: "vm/qfile", - Data: []byte(deploymentPathB), - }) - require.NoError(t, err) - assert.Equal(t, string(query.Response.Data), fileName) } func TestAddPackageSingle_Sponsor_Integration(t *testing.T) { @@ -1159,7 +1104,7 @@ func TestAddPackageSingle_Sponsor_Integration(t *testing.T) { // Ensure sponsoree has enough money to make msg addpackage _, err = sponsorClient.Send(BaseTxCfg{ GasWanted: 1000000, - GasFee: "100000ugnot", + GasFee: ugnot.ValueString(100000), Memo: "Test memo", }, bank.MsgSend{ FromAddress: sponsorInfo.GetAddress(), @@ -1181,7 +1126,7 @@ func TestAddPackageSingle_Sponsor_Integration(t *testing.T) { // Configure the transaction to be sponsored cfg := SponsorTxCfg{ BaseTxCfg: BaseTxCfg{ - GasFee: "10000ugnot", + GasFee: ugnot.ValueString(10000), GasWanted: 8000000, Memo: "", }, @@ -1361,27 +1306,6 @@ func Hello(str string) string { baseAcc, _, err = client.QueryAccount(gnolang.DerivePkgAddr(deploymentPath2)) require.NoError(t, err) assert.Equal(t, baseAcc.GetCoins(), deposit) - - // Test signing separately (using a different deployment path) - deploymentPath1B := "gno.land/p/demo/integration/test/echo2" - deploymentPath2B := "gno.land/p/demo/integration/test/hello2" - msg1.Package.Path = deploymentPath1B - msg2.Package.Path = deploymentPath2B - _, err = addPackageSigningSeparately(t, client, baseCfg, msg1, msg2) - assert.NoError(t, err) - query, err = client.Query(QueryCfg{ - Path: "vm/qfile", - Data: []byte(deploymentPath1B), - }) - require.NoError(t, err) - assert.Equal(t, string(query.Response.Data), "echo.gno") - query, err = client.Query(QueryCfg{ - Path: "vm/qfile", - Data: []byte(deploymentPath2B), - }) - require.NoError(t, err) - assert.Contains(t, string(query.Response.Data), "hello.gno") - assert.Contains(t, string(query.Response.Data), "gno.mod") } func TestAddPackageMultiple_Sponsor_Integration(t *testing.T) { @@ -1421,7 +1345,7 @@ func TestAddPackageMultiple_Sponsor_Integration(t *testing.T) { // Ensure sponsoree has enough money to make msg addpackage _, err = sponsorClient.Send(BaseTxCfg{ GasWanted: 1000000, - GasFee: "100000ugnot", + GasFee: ugnot.ValueString(100000), Memo: "Test memo", }, bank.MsgSend{ FromAddress: sponsorInfo.GetAddress(), @@ -1443,7 +1367,7 @@ func TestAddPackageMultiple_Sponsor_Integration(t *testing.T) { // Configure the transaction to be sponsored cfg := SponsorTxCfg{ BaseTxCfg: BaseTxCfg{ - GasFee: "10000ugnot", + GasFee: ugnot.ValueString(10000), GasWanted: 8000000, Memo: "", },