Skip to content

Commit 02dc44e

Browse files
colin-axnercolin-axner
authored
Merge pull request from GHSA-832c-mq9v-367r
* fix: use block app hash and tx list to generate interchain account address Generate interchain account addresses using host connection ID, controller PortID, block app hash, and block data hash Update tests to handle non-determinstic address creation Add test case to ensure address generation is block dependent * fix: return error on existing non-interchainaccounts for generated address If an account exists and is not an interchain account return an error Add test cases for existing accounts, both interchain and non interchain account Refactor account tests to be table tests * fix: refactor handshake code to account for block dependent address generation * add more test cases, update error messaging * self review fix * increase test readability * add test cases for controller side channel reopening * chore: fix godoc
1 parent b97729d commit 02dc44e

17 files changed

Lines changed: 263 additions & 132 deletions

‎modules/apps/27-interchain-accounts/controller/ibc_middleware_test.go‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
sdk "github.com/cosmos/cosmos-sdk/types"
88
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
99
"github.com/stretchr/testify/suite"
10-
"github.com/tendermint/tendermint/crypto"
1110

1211
"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller"
1312
"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
@@ -20,12 +19,6 @@ import (
2019
)
2120

2221
var (
23-
// TODO: Cosmos-SDK ADR-28: Update crypto.AddressHash() when sdk uses address.Module()
24-
// https://github.com/cosmos/cosmos-sdk/issues/10225
25-
//
26-
// TestAccAddress defines a reusable bech32 address for testing purposes
27-
TestAccAddress = icatypes.GenerateAddress(sdk.AccAddress(crypto.AddressHash([]byte(icatypes.ModuleName))), ibctesting.FirstConnectionID, TestPortID)
28-
2922
// TestOwnerAddress defines a reusable bech32 address for testing purposes
3023
TestOwnerAddress = "cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs"
3124

@@ -570,7 +563,7 @@ func (suite *InterchainAccountsTestSuite) TestOnRecvPacket() {
570563
0,
571564
)
572565

573-
ack := cbs.OnRecvPacket(suite.chainA.GetContext(), packet, TestAccAddress)
566+
ack := cbs.OnRecvPacket(suite.chainA.GetContext(), packet, nil)
574567
suite.Require().Equal(tc.expPass, ack.Success())
575568
})
576569
}

‎modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import (
44
"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper"
55
"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
66
genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
7+
icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
78
ibctesting "github.com/cosmos/ibc-go/v5/testing"
89
)
910

1011
func (suite *KeeperTestSuite) TestInitGenesis() {
1112
suite.SetupTest()
1213

14+
interchainAccAddr := icatypes.GenerateAddress(suite.chainB.GetContext(), ibctesting.FirstConnectionID, TestPortID)
1315
genesisState := genesistypes.ControllerGenesisState{
1416
ActiveChannels: []genesistypes.ActiveChannel{
1517
{
@@ -23,7 +25,7 @@ func (suite *KeeperTestSuite) TestInitGenesis() {
2325
{
2426
ConnectionId: ibctesting.FirstConnectionID,
2527
PortId: TestPortID,
26-
AccountAddress: TestAccAddress.String(),
28+
AccountAddress: interchainAccAddr.String(),
2729
},
2830
},
2931
Ports: []string{TestPortID},
@@ -40,7 +42,7 @@ func (suite *KeeperTestSuite) TestInitGenesis() {
4042

4143
accountAdrr, found := suite.chainA.GetSimApp().ICAControllerKeeper.GetInterchainAccountAddress(suite.chainA.GetContext(), ibctesting.FirstConnectionID, TestPortID)
4244
suite.Require().True(found)
43-
suite.Require().Equal(TestAccAddress.String(), accountAdrr)
45+
suite.Require().Equal(interchainAccAddr.String(), accountAdrr)
4446

4547
expParams := types.NewParams(false)
4648
params := suite.chainA.GetSimApp().ICAControllerKeeper.GetParams(suite.chainA.GetContext())
@@ -56,13 +58,16 @@ func (suite *KeeperTestSuite) TestExportGenesis() {
5658
err := SetupICAPath(path, TestOwnerAddress)
5759
suite.Require().NoError(err)
5860

61+
interchainAccAddr, exists := suite.chainB.GetSimApp().ICAHostKeeper.GetInterchainAccountAddress(suite.chainB.GetContext(), path.EndpointB.ConnectionID, path.EndpointA.ChannelConfig.PortID)
62+
suite.Require().True(exists)
63+
5964
genesisState := keeper.ExportGenesis(suite.chainA.GetContext(), suite.chainA.GetSimApp().ICAControllerKeeper)
6065

6166
suite.Require().Equal(path.EndpointA.ChannelID, genesisState.ActiveChannels[0].ChannelId)
6267
suite.Require().Equal(path.EndpointA.ChannelConfig.PortID, genesisState.ActiveChannels[0].PortId)
6368
suite.Require().True(genesisState.ActiveChannels[0].IsMiddlewareEnabled)
6469

65-
suite.Require().Equal(TestAccAddress.String(), genesisState.InterchainAccounts[0].AccountAddress)
70+
suite.Require().Equal(interchainAccAddr, genesisState.InterchainAccounts[0].AccountAddress)
6671
suite.Require().Equal(path.EndpointA.ChannelConfig.PortID, genesisState.InterchainAccounts[0].PortId)
6772

6873
suite.Require().Equal([]string{TestPortID}, genesisState.GetPorts())

‎modules/apps/27-interchain-accounts/controller/keeper/grpc_query_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

66
"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
7-
icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
87
ibctesting "github.com/cosmos/ibc-go/v5/testing"
98
)
109

@@ -64,10 +63,11 @@ func (suite *KeeperTestSuite) TestQueryInterchainAccount() {
6463
res, err := suite.chainA.GetSimApp().ICAControllerKeeper.InterchainAccount(sdk.WrapSDKContext(suite.chainA.GetContext()), req)
6564

6665
if tc.expPass {
67-
expAddress := icatypes.GenerateAddress(suite.chainA.GetSimApp().AccountKeeper.GetModuleAddress(icatypes.ModuleName), path.EndpointB.ConnectionID, path.EndpointA.ChannelConfig.PortID)
66+
expAddress, exists := suite.chainB.GetSimApp().ICAHostKeeper.GetInterchainAccountAddress(suite.chainB.GetContext(), path.EndpointB.ConnectionID, path.EndpointA.ChannelConfig.PortID)
67+
suite.Require().True(exists)
6868

6969
suite.Require().NoError(err)
70-
suite.Require().Equal(expAddress.String(), res.Address)
70+
suite.Require().Equal(expAddress, res.Address)
7171
} else {
7272
suite.Require().Error(err)
7373
}

‎modules/apps/27-interchain-accounts/controller/keeper/handshake_test.go‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ func (suite *KeeperTestSuite) TestOnChanOpenInit() {
2424
}{
2525
{
2626
"success",
27-
func() {
28-
path.EndpointA.SetChannel(*channel)
29-
},
27+
func() {},
3028
true,
3129
},
3230
{
@@ -54,30 +52,44 @@ func (suite *KeeperTestSuite) TestOnChanOpenInit() {
5452
},
5553
true,
5654
},
55+
{
56+
"success: channel reopening",
57+
func() {
58+
err := SetupICAPath(path, TestOwnerAddress)
59+
suite.Require().NoError(err)
60+
61+
err = path.EndpointA.SetChannelClosed()
62+
suite.Require().NoError(err)
63+
64+
err = path.EndpointB.SetChannelClosed()
65+
suite.Require().NoError(err)
66+
67+
path.EndpointA.ChannelID = ""
68+
path.EndpointB.ChannelID = ""
69+
},
70+
true,
71+
},
5772
{
5873
"invalid metadata - previous metadata is different",
5974
func() {
6075
// set active channel to closed
6176
suite.chainA.GetSimApp().ICAControllerKeeper.SetActiveChannelID(suite.chainA.GetContext(), ibctesting.FirstConnectionID, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID)
6277

78+
// attempt to downgrade version by reinitializing channel with version 1, but setting channel to version 2
79+
metadata.Version = "ics27-2"
80+
81+
versionBytes, err := icatypes.ModuleCdc.MarshalJSON(&metadata)
82+
suite.Require().NoError(err)
83+
6384
counterparty := channeltypes.NewCounterparty(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID)
6485
closedChannel := channeltypes.Channel{
6586
State: channeltypes.CLOSED,
6687
Ordering: channeltypes.ORDERED,
6788
Counterparty: counterparty,
6889
ConnectionHops: []string{path.EndpointA.ConnectionID},
69-
Version: TestVersion,
90+
Version: string(versionBytes),
7091
}
71-
7292
path.EndpointA.SetChannel(closedChannel)
73-
74-
// modify metadata
75-
metadata.Version = "ics27-2"
76-
77-
versionBytes, err := icatypes.ModuleCdc.MarshalJSON(&metadata)
78-
suite.Require().NoError(err)
79-
80-
channel.Version = string(versionBytes)
8193
},
8294
false,
8395
},
@@ -384,7 +396,10 @@ func (suite *KeeperTestSuite) TestOnChanOpenAck() {
384396
err = path.EndpointB.ChanOpenTry()
385397
suite.Require().NoError(err)
386398

387-
metadata = icatypes.NewMetadata(icatypes.Version, ibctesting.FirstConnectionID, ibctesting.FirstConnectionID, TestAccAddress.String(), icatypes.EncodingProtobuf, icatypes.TxTypeSDKMultiMsg)
399+
interchainAccAddr, exists := suite.chainB.GetSimApp().ICAHostKeeper.GetInterchainAccountAddress(suite.chainB.GetContext(), path.EndpointB.ConnectionID, path.EndpointA.ChannelConfig.PortID)
400+
suite.Require().True(exists)
401+
402+
metadata = icatypes.NewMetadata(icatypes.Version, ibctesting.FirstConnectionID, ibctesting.FirstConnectionID, interchainAccAddr, icatypes.EncodingProtobuf, icatypes.TxTypeSDKMultiMsg)
388403
versionBytes, err := icatypes.ModuleCdc.MarshalJSON(&metadata)
389404
suite.Require().NoError(err)
390405

‎modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ package keeper_test
33
import (
44
"testing"
55

6-
sdk "github.com/cosmos/cosmos-sdk/types"
76
"github.com/stretchr/testify/suite"
8-
"github.com/tendermint/tendermint/crypto"
97

108
genesistypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/genesis/types"
119
icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
@@ -14,12 +12,6 @@ import (
1412
)
1513

1614
var (
17-
// TODO: Cosmos-SDK ADR-28: Update crypto.AddressHash() when sdk uses address.Module()
18-
// https://github.com/cosmos/cosmos-sdk/issues/10225
19-
//
20-
// TestAccAddress defines a reusable bech32 address for testing purposes
21-
TestAccAddress = icatypes.GenerateAddress(sdk.AccAddress(crypto.AddressHash([]byte(icatypes.ModuleName))), ibctesting.FirstConnectionID, TestPortID)
22-
2315
// TestOwnerAddress defines a reusable bech32 address for testing purposes
2416
TestOwnerAddress = "cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs"
2517

@@ -153,11 +145,10 @@ func (suite *KeeperTestSuite) TestGetInterchainAccountAddress() {
153145
suite.Require().NoError(err)
154146

155147
counterpartyPortID := path.EndpointA.ChannelConfig.PortID
156-
expectedAddr := icatypes.GenerateAddress(suite.chainA.GetSimApp().AccountKeeper.GetModuleAddress(icatypes.ModuleName), ibctesting.FirstConnectionID, counterpartyPortID)
157148

158149
retrievedAddr, found := suite.chainA.GetSimApp().ICAControllerKeeper.GetInterchainAccountAddress(suite.chainA.GetContext(), ibctesting.FirstConnectionID, counterpartyPortID)
159150
suite.Require().True(found)
160-
suite.Require().Equal(expectedAddr.String(), retrievedAddr)
151+
suite.Require().NotEmpty(retrievedAddr)
161152

162153
retrievedAddr, found = suite.chainA.GetSimApp().ICAControllerKeeper.GetInterchainAccountAddress(suite.chainA.GetContext(), "invalid conn", "invalid port")
163154
suite.Require().False(found)
@@ -214,13 +205,16 @@ func (suite *KeeperTestSuite) TestGetAllInterchainAccounts() {
214205
err := SetupICAPath(path, TestOwnerAddress)
215206
suite.Require().NoError(err)
216207

208+
interchainAccAddr, exists := suite.chainB.GetSimApp().ICAHostKeeper.GetInterchainAccountAddress(suite.chainB.GetContext(), path.EndpointB.ConnectionID, path.EndpointA.ChannelConfig.PortID)
209+
suite.Require().True(exists)
210+
217211
suite.chainA.GetSimApp().ICAControllerKeeper.SetInterchainAccountAddress(suite.chainA.GetContext(), ibctesting.FirstConnectionID, expectedPortID, expectedAccAddr)
218212

219213
expectedAccounts := []genesistypes.RegisteredInterchainAccount{
220214
{
221215
ConnectionId: ibctesting.FirstConnectionID,
222216
PortId: TestPortID,
223-
AccountAddress: TestAccAddress.String(),
217+
AccountAddress: interchainAccAddr,
224218
},
225219
{
226220
ConnectionId: ibctesting.FirstConnectionID,

‎modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ func (suite *KeeperTestSuite) TestSubmitTx() {
124124
},
125125
{
126126
"failure - active channel does not exist for port ID", func() {
127-
msg.Owner = TestAccAddress.String()
127+
msg.Owner = "invalid-owner"
128128
},
129129
false,
130130
},
131131
{
132132
"failure - controller module does not own capability for this channel", func() {
133-
msg.Owner = TestAccAddress.String()
133+
msg.Owner = "invalid-owner"
134134
portID, err := icatypes.NewControllerPortID(msg.Owner)
135135
suite.Require().NoError(err)
136136

‎modules/apps/27-interchain-accounts/host/ibc_module_test.go‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
1111
"github.com/gogo/protobuf/proto"
1212
"github.com/stretchr/testify/suite"
13-
"github.com/tendermint/tendermint/crypto"
1413

1514
"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
1615
icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
@@ -22,12 +21,6 @@ import (
2221
)
2322

2423
var (
25-
// TODO: Cosmos-SDK ADR-28: Update crypto.AddressHash() when sdk uses address.Module()
26-
// https://github.com/cosmos/cosmos-sdk/issues/10225
27-
//
28-
// TestAccAddress defines a reusable bech32 address for testing purposes
29-
TestAccAddress = icatypes.GenerateAddress(sdk.AccAddress(crypto.AddressHash([]byte(icatypes.ModuleName))), ibctesting.FirstConnectionID, TestPortID)
30-
3124
// TestOwnerAddress defines a reusable bech32 address for testing purposes
3225
TestOwnerAddress = "cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs"
3326

@@ -148,6 +141,17 @@ func (suite *InterchainAccountsTestSuite) TestOnChanOpenTry() {
148141
{
149142
"success", func() {}, true,
150143
},
144+
{
145+
"account address generation is block dependent", func() {
146+
icaHostAccount := icatypes.GenerateAddress(suite.chainB.GetContext(), path.EndpointB.ConnectionID, path.EndpointA.ChannelConfig.PortID)
147+
err := suite.chainB.GetSimApp().BankKeeper.SendCoins(suite.chainB.GetContext(), suite.chainB.SenderAccount.GetAddress(), icaHostAccount, sdk.Coins{sdk.NewCoin("stake", sdk.NewInt(1))})
148+
suite.Require().NoError(err)
149+
suite.Require().True(suite.chainB.GetSimApp().AccountKeeper.HasAccount(suite.chainB.GetContext(), icaHostAccount))
150+
151+
// ensure account registration is simulated in a separate block
152+
suite.chainB.NextBlock()
153+
}, true,
154+
},
151155
{
152156
"host submodule disabled", func() {
153157
suite.chainB.GetSimApp().ICAHostKeeper.SetParams(suite.chainB.GetContext(), types.NewParams(false, []string{}))
@@ -214,6 +218,10 @@ func (suite *InterchainAccountsTestSuite) TestOnChanOpenTry() {
214218

215219
if tc.expPass {
216220
suite.Require().NoError(err)
221+
222+
addr, exists := suite.chainB.GetSimApp().ICAHostKeeper.GetInterchainAccountAddress(suite.chainB.GetContext(), path.EndpointB.ConnectionID, counterparty.PortId)
223+
suite.Require().True(exists)
224+
suite.Require().NotNil(addr)
217225
} else {
218226
suite.Require().Error(err)
219227
suite.Require().Equal("", version)
@@ -527,7 +535,7 @@ func (suite *InterchainAccountsTestSuite) TestOnAcknowledgementPacket() {
527535
0,
528536
)
529537

530-
err = cbs.OnAcknowledgementPacket(suite.chainB.GetContext(), packet, []byte("ackBytes"), TestAccAddress)
538+
err = cbs.OnAcknowledgementPacket(suite.chainB.GetContext(), packet, []byte("ackBytes"), nil)
531539

532540
if tc.expPass {
533541
suite.Require().NoError(err)
@@ -580,7 +588,7 @@ func (suite *InterchainAccountsTestSuite) TestOnTimeoutPacket() {
580588
0,
581589
)
582590

583-
err = cbs.OnTimeoutPacket(suite.chainA.GetContext(), packet, TestAccAddress)
591+
err = cbs.OnTimeoutPacket(suite.chainA.GetContext(), packet, nil)
584592

585593
if tc.expPass {
586594
suite.Require().NoError(err)
@@ -606,21 +614,28 @@ func (suite *InterchainAccountsTestSuite) fundICAWallet(ctx sdk.Context, portID
606614
suite.Require().NoError(err)
607615
}
608616

609-
// TestControlAccountAfterChannelClose tests that a controller chain can control a registered interchain account after the currently active channel for that interchain account has been closed
610-
// by opening a new channel on the associated portID
617+
// TestControlAccountAfterChannelClose tests that a controller chain can control a registered interchain account after the currently active channel for that interchain account has been closed.
618+
// A new channel will be opened for the controller portID. The interchain account address should remain unchanged.
611619
func (suite *InterchainAccountsTestSuite) TestControlAccountAfterChannelClose() {
612-
// create channel + init interchain account on a particular port
613620
path := NewICAPath(suite.chainA, suite.chainB)
614621
suite.coordinator.SetupConnections(path)
622+
615623
err := SetupICAPath(path, TestOwnerAddress)
616624
suite.Require().NoError(err)
617625

626+
// two sends will be performed, one after initial creation of the account and one after channel closure and reopening
627+
var (
628+
startingBal = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000)))
629+
tokenAmt = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(5000)))
630+
expBalAfterFirstSend = startingBal.Sub(tokenAmt...)
631+
expBalAfterSecondSend = expBalAfterFirstSend.Sub(tokenAmt...)
632+
)
633+
618634
// check that the account is working as expected
619-
suite.fundICAWallet(suite.chainB.GetContext(), path.EndpointA.ChannelConfig.PortID, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(10000))))
620-
interchainAccountAddr, found := suite.chainB.GetSimApp().ICAHostKeeper.GetInterchainAccountAddress(suite.chainB.GetContext(), ibctesting.FirstConnectionID, path.EndpointA.ChannelConfig.PortID)
635+
suite.fundICAWallet(suite.chainB.GetContext(), path.EndpointA.ChannelConfig.PortID, startingBal)
636+
interchainAccountAddr, found := suite.chainB.GetSimApp().ICAHostKeeper.GetInterchainAccountAddress(suite.chainB.GetContext(), path.EndpointB.ConnectionID, path.EndpointA.ChannelConfig.PortID)
621637
suite.Require().True(found)
622638

623-
tokenAmt := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(5000)))
624639
msg := &banktypes.MsgSend{
625640
FromAddress: interchainAccountAddr,
626641
ToAddress: suite.chainB.SenderAccount.GetAddress().String(),
@@ -651,8 +666,7 @@ func (suite *InterchainAccountsTestSuite) TestControlAccountAfterChannelClose()
651666
icaAddr, err := sdk.AccAddressFromBech32(interchainAccountAddr)
652667
suite.Require().NoError(err)
653668

654-
hasBalance := suite.chainB.GetSimApp().BankKeeper.HasBalance(suite.chainB.GetContext(), icaAddr, sdk.Coin{Denom: sdk.DefaultBondDenom, Amount: sdk.NewInt(5000)})
655-
suite.Require().True(hasBalance)
669+
suite.assertBalance(icaAddr, expBalAfterFirstSend)
656670

657671
// close the channel
658672
err = path.EndpointA.SetChannelClosed()
@@ -674,7 +688,12 @@ func (suite *InterchainAccountsTestSuite) TestControlAccountAfterChannelClose()
674688
err = path.RelayPacket(packetRelay)
675689
suite.Require().NoError(err) // relay committed
676690

677-
// check that the ica balance is updated
678-
hasBalance = suite.chainB.GetSimApp().BankKeeper.HasBalance(suite.chainB.GetContext(), icaAddr, sdk.Coin{Denom: sdk.DefaultBondDenom, Amount: sdk.NewInt(0)})
679-
suite.Require().True(hasBalance)
691+
suite.assertBalance(icaAddr, expBalAfterSecondSend)
692+
}
693+
694+
// assertBalance asserts that the provided address has exactly the expected balance.
695+
// CONTRACT: the expected balance must only contain one coin denom.
696+
func (suite *InterchainAccountsTestSuite) assertBalance(addr sdk.AccAddress, expBalance sdk.Coins) {
697+
balance := suite.chainB.GetSimApp().BankKeeper.GetBalance(suite.chainB.GetContext(), addr, sdk.DefaultBondDenom)
698+
suite.Require().Equal(expBalance[0], balance)
680699
}

0 commit comments

Comments
 (0)