@@ -319,6 +319,7 @@ func (suite *HooksTestSuite) receivePacketWithSequence(receiver, memo string, pr
319319
320320 // recv in chain a
321321 res , err := suite .pathAB .EndpointA .RecvPacketWithResult (packet )
322+ suite .Require ().NoError (err )
322323
323324 // get the ack from the chain a's response
324325 ack , err := ibctesting .ParseAckFromEvents (res .GetEvents ())
@@ -593,15 +594,17 @@ func (suite *HooksTestSuite) TestAcks() {
593594 callbackMemo := fmt .Sprintf (`{"ibc_callback":"%s"}` , addr )
594595 // Send IBC transfer with the memo with crosschain-swap instructions
595596 transferMsg := NewMsgTransfer (sdk .NewCoin (sdk .DefaultBondDenom , sdk .NewInt (1000 )), suite .chainA .SenderAccount .GetAddress ().String (), addr .String (), "channel-0" , callbackMemo )
596- suite .FullSend (transferMsg , AtoB )
597+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoB )
598+ suite .Require ().NoError (err )
597599
598600 // The test contract will increment the counter for itself every time it receives an ack
599601 state := suite .chainA .QueryContract (
600602 & suite .Suite , addr ,
601603 []byte (fmt .Sprintf (`{"get_count": {"addr": "%s"}}` , addr )))
602604 suite .Require ().Equal (`{"count":1}` , state )
603605
604- suite .FullSend (transferMsg , AtoB )
606+ _ , _ , _ , err = suite .FullSend (transferMsg , AtoB )
607+ suite .Require ().NoError (err )
605608 state = suite .chainA .QueryContract (
606609 & suite .Suite , addr ,
607610 []byte (fmt .Sprintf (`{"get_count": {"addr": "%s"}}` , addr )))
@@ -792,17 +795,20 @@ func (suite *HooksTestSuite) SetupCrosschainRegistry(chainName Chain) (sdk.AccAd
792795
793796 // Send some token0 tokens from C to B
794797 transferMsg := NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (2000 )), suite .chainC .SenderAccount .GetAddress ().String (), suite .chainB .SenderAccount .GetAddress ().String (), "channel-0" , "" )
795- suite .FullSend (transferMsg , CtoB )
798+ _ , _ , _ , err = suite .FullSend (transferMsg , CtoB )
799+ suite .Require ().NoError (err )
796800
797801 // Send some token0 tokens from B to A
798802 transferMsg = NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (2000 )), suite .chainB .SenderAccount .GetAddress ().String (), suite .chainA .SenderAccount .GetAddress ().String (), "channel-0" , "" )
799- suite .FullSend (transferMsg , BtoA )
803+ _ , _ , _ , err = suite .FullSend (transferMsg , BtoA )
804+ suite .Require ().NoError (err )
800805
801806 // Send some token0 tokens from C to B to A
802807 denomTrace0CB := transfertypes .ParseDenomTrace (transfertypes .GetPrefixedDenom ("transfer" , suite .pathBC .EndpointA .ChannelID , "token0" ))
803808 token0CB := denomTrace0CB .IBCDenom ()
804809 transferMsg = NewMsgTransfer (sdk .NewCoin (token0CB , sdk .NewInt (2000 )), suite .chainB .SenderAccount .GetAddress ().String (), suite .chainA .SenderAccount .GetAddress ().String (), "channel-0" , "" )
805- suite .FullSend (transferMsg , BtoA )
810+ _ , _ , _ , err = suite .FullSend (transferMsg , BtoA )
811+ suite .Require ().NoError (err )
806812
807813 // Denom traces
808814 CBAPath := fmt .Sprintf ("transfer/%s/transfer/%s" , suite .pathAB .EndpointA .ChannelID , suite .pathBC .EndpointA .ChannelID )
@@ -1060,7 +1066,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCTest() {
10601066 _ , crosschainAddr := suite .SetupCrosschainSwaps (ChainA )
10611067 // Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
10621068 transferMsg := NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (2000 )), suite .chainA .SenderAccount .GetAddress ().String (), initializer .String (), "channel-0" , "" )
1063- suite .FullSend (transferMsg , AtoB )
1069+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoB )
1070+ suite .Require ().NoError (err )
10641071
10651072 // Calculate the names of the tokens when swapped via IBC
10661073 denomTrace0 := transfertypes .ParseDenomTrace (transfertypes .GetPrefixedDenom ("transfer" , "channel-0" , "token0" ))
@@ -1110,7 +1117,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCBadAck() {
11101117 _ , crosschainAddr := suite .SetupCrosschainSwaps (ChainA )
11111118 // Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
11121119 transferMsg := NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (2000 )), suite .chainA .SenderAccount .GetAddress ().String (), initializer .String (), "channel-0" , "" )
1113- suite .FullSend (transferMsg , AtoB )
1120+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoB )
1121+ suite .Require ().NoError (err )
11141122
11151123 // Calculate the names of the tokens when swapped via IBC
11161124 denomTrace0 := transfertypes .ParseDenomTrace (transfertypes .GetPrefixedDenom ("transfer" , "channel-0" , "token0" ))
@@ -1205,7 +1213,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCBadSwap() {
12051213 _ , crosschainAddr := suite .SetupCrosschainSwaps (ChainA )
12061214 // Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
12071215 transferMsg := NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (2000 )), suite .chainA .SenderAccount .GetAddress ().String (), initializer .String (), "channel-0" , "" )
1208- suite .FullSend (transferMsg , AtoB )
1216+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoB )
1217+ suite .Require ().NoError (err )
12091218
12101219 // Calculate the names of the tokens when swapped via IBC
12111220 denomTrace0 := transfertypes .ParseDenomTrace (transfertypes .GetPrefixedDenom ("transfer" , "channel-0" , "token0" ))
@@ -1247,7 +1256,8 @@ func (suite *HooksTestSuite) TestBadCrosschainSwapsNextMemoMessages() {
12471256 _ , crosschainAddr := suite .SetupCrosschainSwaps (ChainA )
12481257 // Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
12491258 transferMsg := NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (20000 )), suite .chainA .SenderAccount .GetAddress ().String (), initializer .String (), "channel-0" , "" )
1250- suite .FullSend (transferMsg , AtoB )
1259+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoB )
1260+ suite .Require ().NoError (err )
12511261
12521262 // Calculate the names of the tokens when swapped via IBC
12531263 denomTrace0 := transfertypes .ParseDenomTrace (transfertypes .GetPrefixedDenom ("transfer" , "channel-0" , "token0" ))
@@ -1396,9 +1406,11 @@ func (suite *HooksTestSuite) TestCrosschainForwardWithMemo() {
13961406 swaprouterAddrB , crosschainAddrB := suite .SetupCrosschainSwaps (ChainB )
13971407 // Send some token0 and token1 tokens to B so that there are ibc token0 to send to A and crosschain-swap, and token1 to create the pool
13981408 transferMsg := NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (500000 )), suite .chainA .SenderAccount .GetAddress ().String (), initializer .String (), "channel-0" , "" )
1399- suite .FullSend (transferMsg , AtoB )
1409+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoB )
1410+ suite .Require ().NoError (err )
14001411 transferMsg1 := NewMsgTransfer (sdk .NewCoin ("token1" , sdk .NewInt (500000 )), suite .chainA .SenderAccount .GetAddress ().String (), initializer .String (), "channel-0" , "" )
1401- suite .FullSend (transferMsg1 , AtoB )
1412+ _ , _ , _ , err = suite .FullSend (transferMsg1 , AtoB )
1413+ suite .Require ().NoError (err )
14021414 denom := suite .GetIBCDenom (ChainA , ChainB , "token1" )
14031415 poolId := suite .CreateIBCNativePoolOnChain (ChainB , denom )
14041416 suite .SetupIBCRouteOnChain (swaprouterAddrB , suite .chainB .SenderAccount .GetAddress (), poolId , ChainB , denom )
@@ -1472,7 +1484,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCMultiHop() {
14721484 suite .pathAC .EndpointA .ChannelID ,
14731485 "" ,
14741486 )
1475- suite .FullSend (transferMsg , AtoC )
1487+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoC )
1488+ suite .Require ().NoError (err )
14761489
14771490 token0AC := transfertypes .ParseDenomTrace (transfertypes .GetPrefixedDenom ("transfer" , suite .pathAC .EndpointB .ChannelID , "token0" )).IBCDenom ()
14781491 transferMsg = NewMsgTransfer (
@@ -1482,7 +1495,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCMultiHop() {
14821495 suite .pathBC .EndpointB .ChannelID ,
14831496 "" ,
14841497 )
1485- suite .FullSend (transferMsg , CtoB )
1498+ _ , _ , _ , err = suite .FullSend (transferMsg , CtoB )
1499+ suite .Require ().NoError (err )
14861500
14871501 // Calculate the names of the tokens when sent via IBC
14881502 ACBPath := fmt .Sprintf ("transfer/%s/transfer/%s" , suite .pathAC .EndpointB .ChannelID , suite .pathBC .EndpointA .ChannelID )
@@ -1564,7 +1578,6 @@ func (suite *HooksTestSuite) SimpleNativeTransfer(token string, amount sdk.Int,
15641578 prevPrefix = strings .TrimLeft (prevPrefix , "/" )
15651579 denom = transfertypes.DenomTrace {Path : prevPrefix , BaseDenom : token }.IBCDenom ()
15661580 prev = toChain
1567-
15681581 }
15691582 return denom
15701583}
@@ -1795,7 +1808,8 @@ func (suite *HooksTestSuite) ExecuteOutpostSwap(initializer, receiverAddr sdk.Ac
17951808
17961809 // Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
17971810 transferMsg := NewMsgTransfer (sdk .NewCoin ("token0" , sdk .NewInt (2000 )), suite .chainA .SenderAccount .GetAddress ().String (), initializer .String (), "channel-0" , "" )
1798- suite .FullSend (transferMsg , AtoB )
1811+ _ , _ , _ , err := suite .FullSend (transferMsg , AtoB )
1812+ suite .Require ().NoError (err )
17991813
18001814 // Calculate the names of the tokens when swapped via IBC
18011815 denomTrace0 := transfertypes .ParseDenomTrace (transfertypes .GetPrefixedDenom ("transfer" , "channel-0" , "token0" ))
@@ -1817,7 +1831,7 @@ func (suite *HooksTestSuite) ExecuteOutpostSwap(initializer, receiverAddr sdk.Ac
18171831 // Call the outpost
18181832 contractKeeper := wasmkeeper .NewDefaultPermissionKeeper (osmosisAppB .WasmKeeper )
18191833 ctxB := suite .chainB .GetContext ()
1820- _ , err : = contractKeeper .Execute (ctxB , outpostAddr , initializer , []byte (swapMsg ), sdk .NewCoins (sdk .NewCoin (token0IBC , sdk .NewInt (1000 ))))
1834+ _ , err = contractKeeper .Execute (ctxB , outpostAddr , initializer , []byte (swapMsg ), sdk .NewCoins (sdk .NewCoin (token0IBC , sdk .NewInt (1000 ))))
18211835 suite .Require ().NoError (err )
18221836 suite .chainB .NextBlock ()
18231837 err = suite .pathAB .EndpointA .UpdateClient ()
0 commit comments