chore: check all errors in tests (#5104)

* run golangci-lint and resolve ineffectual assignment to err * go work sync * waypoint in "check all errors in tests" * 50 error checks remaining * 42 errors remaining to check in tests * all tests pass and as many errors as possible have been checked * revert enabling golangci-lint to check tests, as it would always fail afterwards * update changelog * use thelper in golangci-lint without linting every test * Update tests/e2e/containers/containers.go Co-authored-by: Roman <[email protected]> * thelper for incentives bench test * Update x/concentrated-liquidity/position_test.go Co-authored-by: Adam Tucker <[email protected]> * Update CHANGELOG.md Co-authored-by: Roman <[email protected]> * return error in SetIncentiveRecord * revert change to .golanci.yml --------- Co-authored-by: Roman <[email protected]> Co-authored-by: Adam Tucker <[email protected]>
osmosis-labs · May 9, 2023 · 86f9c1e · 86f9c1e
1 parent 0e48fa0
commit 86f9c1e
Show file tree

Hide file tree

Showing 74 changed files with 413 additions and 214 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -18,7 +18,6 @@ linters:
     - goconst
     - gofmt
     - goimports
-    # - gofumpt
     - goheader
     - gomodguard
     - goprintffuncname
@@ -30,14 +29,14 @@ linters:
     - misspell
     - nakedret
     - nilnil
-    - paralleltest
     - promlinter
     - staticcheck
     - stylecheck
     - tenv
     - thelper
-    - testpackage
+    - tparallel
     - typecheck
+    - thelper
     - unconvert
     - unused
     - whitespace

diff --git a/app/upgrades/v12/upgrade_test.go b/app/upgrades/v12/upgrade_test.go
@@ -53,7 +53,7 @@ func (suite *UpgradeTestSuite) TestPoolMigration() {
 				plan := upgradetypes.Plan{Name: "v12", Height: dummyUpgradeHeight}
 				err := suite.App.UpgradeKeeper.ScheduleUpgrade(suite.Ctx, plan)
 				suite.Require().NoError(err)
-				plan, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
+				_, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
 				suite.Require().True(exists)
 
 				suite.Ctx = suite.Ctx.WithBlockHeight(dummyUpgradeHeight)

diff --git a/app/upgrades/v13/upgrade_test.go b/app/upgrades/v13/upgrade_test.go
@@ -35,7 +35,7 @@ func dummyUpgrade(suite *UpgradeTestSuite) {
 	plan := upgradetypes.Plan{Name: "v13", Height: dummyUpgradeHeight}
 	err := suite.App.UpgradeKeeper.ScheduleUpgrade(suite.Ctx, plan)
 	suite.Require().NoError(err)
-	plan, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
+	_, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
 	suite.Require().True(exists)
 
 	suite.Ctx = suite.Ctx.WithBlockHeight(dummyUpgradeHeight)
@@ -73,7 +73,6 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 				// Same comment as above: this was the case when the upgrade happened, but we don't have accounts anymore
 				// hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
 				// suite.Require().False(hasAcc)
-
 			},
 			func() { dummyUpgrade(suite) },
 			func() {

diff --git a/app/upgrades/v15/upgrade_test.go b/app/upgrades/v15/upgrade_test.go
@@ -128,6 +128,7 @@ func (suite *UpgradeTestSuite) TestMigrateBalancerToStablePools() {
 
 	// shares before migration
 	balancerPool, err := gammKeeper.GetCFMMPool(suite.Ctx, poolID)
+	suite.Require().NoError(err)
 	balancerLiquidity, err := gammKeeper.GetTotalPoolLiquidity(suite.Ctx, balancerPool.GetId())
 	suite.Require().NoError(err)
 
@@ -240,13 +241,16 @@ func (suite *UpgradeTestSuite) TestSetRateLimits() {
 
 	state, err := suite.App.WasmKeeper.QuerySmart(suite.Ctx, addr, []byte(`{"get_quotas": {"channel_id": "any", "denom": "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2"}}`))
 	suite.Require().Greaterf(len(state), 0, "state should not be empty")
+	suite.Require().NoError(err)
 
 	state, err = suite.App.WasmKeeper.QuerySmart(suite.Ctx, addr, []byte(`{"get_quotas": {"channel_id": "any", "denom": "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858"}}`))
 	suite.Require().Greaterf(len(state), 0, "state should not be empty")
+	suite.Require().NoError(err)
 
 	// This is the last one. If the others failed the upgrade would've panicked before adding this one
 	state, err = suite.App.WasmKeeper.QuerySmart(suite.Ctx, addr, []byte(`{"get_quotas": {"channel_id": "any", "denom": "ibc/E6931F78057F7CC5DA0FD6CEF82FF39373A6E0452BF1FD76910B93292CF356C1"}}`))
 	suite.Require().Greaterf(len(state), 0, "state should not be empty")
+	suite.Require().NoError(err)
 }
 
 func (suite *UpgradeTestSuite) validateCons(coinsA, coinsB sdk.Coins) {

diff --git a/app/upgrades/v16/concentrated_pool_test.go b/app/upgrades/v16/concentrated_pool_test.go
@@ -181,9 +181,9 @@ func (suite *ConcentratedUpgradeTestSuite) TestCreateCanonicalConcentratedLiuqid
 			suite.Require().NoError(err)
 
 			// Get balancer gauges.
-			gaugeToRedirect, err := suite.App.PoolIncentivesKeeper.GetPoolGaugeId(suite.Ctx, balancerPool.GetId(), longestLockableDuration)
+			gaugeToRedirect, _ := suite.App.PoolIncentivesKeeper.GetPoolGaugeId(suite.Ctx, balancerPool.GetId(), longestLockableDuration)
 
-			gaugeToNotRedeirect, err := suite.App.PoolIncentivesKeeper.GetPoolGaugeId(suite.Ctx, balancerId2, longestLockableDuration)
+			gaugeToNotRedeirect, _ := suite.App.PoolIncentivesKeeper.GetPoolGaugeId(suite.Ctx, balancerId2, longestLockableDuration)
 
 			originalDistrInfo := poolincentivestypes.DistrInfo{
 				TotalWeight: sdk.NewInt(100),

diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go
@@ -1,7 +1,6 @@
 package e2e
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 	"testing"
@@ -40,7 +39,7 @@ type IntegrationTestSuite struct {
 func TestIntegrationTestSuite(t *testing.T) {
 	isEnabled := os.Getenv(e2eEnabledEnv)
 	if isEnabled != "True" {
-		t.Skip(fmt.Sprintf("e2e test is disabled. To run, set %s to True", e2eEnabledEnv))
+		t.Skipf("e2e test is disabled. To run, set %s to True", e2eEnabledEnv)
 	}
 	suite.Run(t, new(IntegrationTestSuite))
 }
@@ -64,22 +63,22 @@ func (s *IntegrationTestSuite) SetupSuite() {
 		s.skipUpgrade, err = strconv.ParseBool(str)
 		s.Require().NoError(err)
 		if s.skipUpgrade {
-			s.T().Log(fmt.Sprintf("%s was true, skipping upgrade tests", skipUpgradeEnv))
+			s.T().Logf("%s was true, skipping upgrade tests", skipUpgradeEnv)
 		}
 	}
 	upgradeSettings.IsEnabled = !s.skipUpgrade
 
 	if str := os.Getenv(forkHeightEnv); len(str) > 0 {
 		upgradeSettings.ForkHeight, err = strconv.ParseInt(str, 0, 64)
 		s.Require().NoError(err)
-		s.T().Log(fmt.Sprintf("fork upgrade is enabled, %s was set to height %d", forkHeightEnv, upgradeSettings.ForkHeight))
+		s.T().Logf("fork upgrade is enabled, %s was set to height %d", forkHeightEnv, upgradeSettings.ForkHeight)
 	}
 
 	if str := os.Getenv(skipIBCEnv); len(str) > 0 {
 		s.skipIBC, err = strconv.ParseBool(str)
 		s.Require().NoError(err)
 		if s.skipIBC {
-			s.T().Log(fmt.Sprintf("%s was true, skipping IBC tests", skipIBCEnv))
+			s.T().Logf("%s was true, skipping IBC tests", skipIBCEnv)
 		}
 	}
 
@@ -102,7 +101,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 
 	if str := os.Getenv(upgradeVersionEnv); len(str) > 0 {
 		upgradeSettings.Version = str
-		s.T().Log(fmt.Sprintf("upgrade version set to %s", upgradeSettings.Version))
+		s.T().Logf("upgrade version set to %s", upgradeSettings.Version)
 	}
 
 	s.configurer, err = configurer.New(s.T(), !s.skipIBC, isDebugLogEnabled, upgradeSettings)

diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -206,7 +206,8 @@ func (s *IntegrationTestSuite) TestConcentratedLiquidity() {
 	}
 
 	// Change the parameter to enable permisionless pool creation.
-	chainA.SubmitParamChangeProposal("concentratedliquidity", string(cltypes.KeyIsPermisionlessPoolCreationEnabled), []byte("true"))
+	err = chainA.SubmitParamChangeProposal("concentratedliquidity", string(cltypes.KeyIsPermisionlessPoolCreationEnabled), []byte("true"))
+	s.Require().NoError(err)
 
 	// Confirm that the parameter has been changed.
 	isPermisionlessCreationEnabledStr = chainANode.QueryParams(cltypes.ModuleName, string(cltypes.KeyIsPermisionlessPoolCreationEnabled))
@@ -599,7 +600,7 @@ func (s *IntegrationTestSuite) TestConcentratedLiquidity() {
 		addr1BalancesAfter.AmountOf("uion"),
 	)
 
-	// Assert position that was active thoughout the whole swap:
+	// Assert position that was active throughout the whole swap:
 
 	// Track balance of address3
 	addr3BalancesBefore = s.addrBalance(chainANode, address3)
@@ -770,7 +771,7 @@ func (s *IntegrationTestSuite) TestStableSwapPostUpgrade() {
 }
 
 // TestGeometricTwapMigration tests that the geometric twap record
-// migration runs succesfully. It does so by attempting to execute
+// migration runs successfully. It does so by attempting to execute
 // the swap on the pool created pre-upgrade. When a pool is created
 // pre-upgrade, twap records are initialized for a pool. By runnning
 // a swap post-upgrade, we confirm that the geometric twap was initialized
@@ -987,7 +988,6 @@ func (s *IntegrationTestSuite) TestIBCTokenTransferRateLimiting() {
 			val := node.QueryParams(ibcratelimittypes.ModuleName, string(ibcratelimittypes.KeyContractAddress))
 			return strings.Contains(val, param)
 		}, time.Second*30, time.Millisecond*500)
-
 	}
 }
 
@@ -1100,6 +1100,7 @@ func (s *IntegrationTestSuite) TestPacketForwarding() {
 
 	// sender wasm addr
 	senderBech32, err := ibchookskeeper.DeriveIntermediateSender("channel-0", validatorAddr, "osmo")
+	s.Require().NoError(err)
 	s.Require().Eventually(func() bool {
 		response, err := nodeA.QueryWasmSmartObject(contractAddr, fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, senderBech32))
 		if err != nil {
@@ -1154,7 +1155,7 @@ func (s *IntegrationTestSuite) TestAddToExistingLock() {
 // TestArithmeticTWAP tests TWAP by creating a pool, performing a swap.
 // These two operations should create TWAP records.
 // Then, we wait until the epoch for the records to be pruned.
-// The records are guranteed to be pruned at the next epoch
+// The records are guaranteed to be pruned at the next epoch
 // because twap keep time = epoch time / 4 and we use a timer
 // to wait for at least the twap keep time.
 func (s *IntegrationTestSuite) TestArithmeticTWAP() {

diff --git a/tests/e2e/initialization/init_test.go b/tests/e2e/initialization/init_test.go
@@ -47,6 +47,7 @@ func TestChainInit(t *testing.T) {
 		}
 		dataDir, err = os.MkdirTemp("", "osmosis-e2e-testnet-test")
 	)
+	require.NoError(t, err)
 
 	chain, err := initialization.InitChain(id, dataDir, nodeConfigs, time.Second*3, time.Second, forkHeight)
 	require.NoError(t, err)
@@ -104,6 +105,7 @@ func TestSingleNodeInit(t *testing.T) {
 		}
 		dataDir, err = os.MkdirTemp("", "osmosis-e2e-testnet-test")
 	)
+	require.NoError(t, err)
 
 	// Setup
 	existingChain, err := initialization.InitChain(id, dataDir, existingChainNodeConfigs, time.Second*3, time.Second, forkHeight)
@@ -116,6 +118,7 @@ func TestSingleNodeInit(t *testing.T) {
 }
 
 func validateNode(t *testing.T, chainId string, dataDir string, expectedConfig *initialization.NodeConfig, actualNode *initialization.Node) {
+	t.Helper()
 	require.Equal(t, fmt.Sprintf("%s-node-%s", chainId, expectedConfig.Name), actualNode.Name)
 	require.Equal(t, expectedConfig.IsValidator, actualNode.IsValidator)
 

diff --git a/tests/ibc-hooks/ibc_middleware_test.go b/tests/ibc-hooks/ibc_middleware_test.go
@@ -319,6 +319,7 @@ func (suite *HooksTestSuite) receivePacketWithSequence(receiver, memo string, pr
 
 	// recv in chain a
 	res, err := suite.pathAB.EndpointA.RecvPacketWithResult(packet)
+	suite.Require().NoError(err)
 
 	// get the ack from the chain a's response
 	ack, err := ibctesting.ParseAckFromEvents(res.GetEvents())
@@ -593,15 +594,17 @@ func (suite *HooksTestSuite) TestAcks() {
 	callbackMemo := fmt.Sprintf(`{"ibc_callback":"%s"}`, addr)
 	// Send IBC transfer with the memo with crosschain-swap instructions
 	transferMsg := NewMsgTransfer(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1000)), suite.chainA.SenderAccount.GetAddress().String(), addr.String(), "channel-0", callbackMemo)
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err := suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 
 	// The test contract will increment the counter for itself every time it receives an ack
 	state := suite.chainA.QueryContract(
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
 	suite.Require().Equal(`{"count":1}`, state)
 
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err = suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 	state = suite.chainA.QueryContract(
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
@@ -792,17 +795,20 @@ func (suite *HooksTestSuite) SetupCrosschainRegistry(chainName Chain) (sdk.AccAd
 
 	// Send some token0 tokens from C to B
 	transferMsg := NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(2000)), suite.chainC.SenderAccount.GetAddress().String(), suite.chainB.SenderAccount.GetAddress().String(), "channel-0", "")
-	suite.FullSend(transferMsg, CtoB)
+	_, _, _, err = suite.FullSend(transferMsg, CtoB)
+	suite.Require().NoError(err)
 
 	// Send some token0 tokens from B to A
 	transferMsg = NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(2000)), suite.chainB.SenderAccount.GetAddress().String(), suite.chainA.SenderAccount.GetAddress().String(), "channel-0", "")
-	suite.FullSend(transferMsg, BtoA)
+	_, _, _, err = suite.FullSend(transferMsg, BtoA)
+	suite.Require().NoError(err)
 
 	// Send some token0 tokens from C to B to A
 	denomTrace0CB := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", suite.pathBC.EndpointA.ChannelID, "token0"))
 	token0CB := denomTrace0CB.IBCDenom()
 	transferMsg = NewMsgTransfer(sdk.NewCoin(token0CB, sdk.NewInt(2000)), suite.chainB.SenderAccount.GetAddress().String(), suite.chainA.SenderAccount.GetAddress().String(), "channel-0", "")
-	suite.FullSend(transferMsg, BtoA)
+	_, _, _, err = suite.FullSend(transferMsg, BtoA)
+	suite.Require().NoError(err)
 
 	// Denom traces
 	CBAPath := fmt.Sprintf("transfer/%s/transfer/%s", suite.pathAB.EndpointA.ChannelID, suite.pathBC.EndpointA.ChannelID)
@@ -1060,7 +1066,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCTest() {
 	_, crosschainAddr := suite.SetupCrosschainSwaps(ChainA)
 	// Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
 	transferMsg := NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(2000)), suite.chainA.SenderAccount.GetAddress().String(), initializer.String(), "channel-0", "")
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err := suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 
 	// Calculate the names of the tokens when swapped via IBC
 	denomTrace0 := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", "channel-0", "token0"))
@@ -1110,7 +1117,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCBadAck() {
 	_, crosschainAddr := suite.SetupCrosschainSwaps(ChainA)
 	// Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
 	transferMsg := NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(2000)), suite.chainA.SenderAccount.GetAddress().String(), initializer.String(), "channel-0", "")
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err := suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 
 	// Calculate the names of the tokens when swapped via IBC
 	denomTrace0 := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", "channel-0", "token0"))
@@ -1205,7 +1213,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCBadSwap() {
 	_, crosschainAddr := suite.SetupCrosschainSwaps(ChainA)
 	// Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
 	transferMsg := NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(2000)), suite.chainA.SenderAccount.GetAddress().String(), initializer.String(), "channel-0", "")
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err := suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 
 	// Calculate the names of the tokens when swapped via IBC
 	denomTrace0 := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", "channel-0", "token0"))
@@ -1247,7 +1256,8 @@ func (suite *HooksTestSuite) TestBadCrosschainSwapsNextMemoMessages() {
 	_, crosschainAddr := suite.SetupCrosschainSwaps(ChainA)
 	// Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
 	transferMsg := NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(20000)), suite.chainA.SenderAccount.GetAddress().String(), initializer.String(), "channel-0", "")
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err := suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 
 	// Calculate the names of the tokens when swapped via IBC
 	denomTrace0 := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", "channel-0", "token0"))
@@ -1396,9 +1406,11 @@ func (suite *HooksTestSuite) TestCrosschainForwardWithMemo() {
 	swaprouterAddrB, crosschainAddrB := suite.SetupCrosschainSwaps(ChainB)
 	// 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
 	transferMsg := NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(500000)), suite.chainA.SenderAccount.GetAddress().String(), initializer.String(), "channel-0", "")
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err := suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 	transferMsg1 := NewMsgTransfer(sdk.NewCoin("token1", sdk.NewInt(500000)), suite.chainA.SenderAccount.GetAddress().String(), initializer.String(), "channel-0", "")
-	suite.FullSend(transferMsg1, AtoB)
+	_, _, _, err = suite.FullSend(transferMsg1, AtoB)
+	suite.Require().NoError(err)
 	denom := suite.GetIBCDenom(ChainA, ChainB, "token1")
 	poolId := suite.CreateIBCNativePoolOnChain(ChainB, denom)
 	suite.SetupIBCRouteOnChain(swaprouterAddrB, suite.chainB.SenderAccount.GetAddress(), poolId, ChainB, denom)
@@ -1472,7 +1484,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCMultiHop() {
 		suite.pathAC.EndpointA.ChannelID,
 		"",
 	)
-	suite.FullSend(transferMsg, AtoC)
+	_, _, _, err := suite.FullSend(transferMsg, AtoC)
+	suite.Require().NoError(err)
 
 	token0AC := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", suite.pathAC.EndpointB.ChannelID, "token0")).IBCDenom()
 	transferMsg = NewMsgTransfer(
@@ -1482,7 +1495,8 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCMultiHop() {
 		suite.pathBC.EndpointB.ChannelID,
 		"",
 	)
-	suite.FullSend(transferMsg, CtoB)
+	_, _, _, err = suite.FullSend(transferMsg, CtoB)
+	suite.Require().NoError(err)
 
 	// Calculate the names of the tokens when sent via IBC
 	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,
 		prevPrefix = strings.TrimLeft(prevPrefix, "/")
 		denom = transfertypes.DenomTrace{Path: prevPrefix, BaseDenom: token}.IBCDenom()
 		prev = toChain
-
 	}
 	return denom
 }
@@ -1795,7 +1808,8 @@ func (suite *HooksTestSuite) ExecuteOutpostSwap(initializer, receiverAddr sdk.Ac
 
 	// Send some token0 tokens to B so that there are ibc tokens to send to A and crosschain-swap
 	transferMsg := NewMsgTransfer(sdk.NewCoin("token0", sdk.NewInt(2000)), suite.chainA.SenderAccount.GetAddress().String(), initializer.String(), "channel-0", "")
-	suite.FullSend(transferMsg, AtoB)
+	_, _, _, err := suite.FullSend(transferMsg, AtoB)
+	suite.Require().NoError(err)
 
 	// Calculate the names of the tokens when swapped via IBC
 	denomTrace0 := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", "channel-0", "token0"))
@@ -1817,7 +1831,7 @@ func (suite *HooksTestSuite) ExecuteOutpostSwap(initializer, receiverAddr sdk.Ac
 	// Call the outpost
 	contractKeeper := wasmkeeper.NewDefaultPermissionKeeper(osmosisAppB.WasmKeeper)
 	ctxB := suite.chainB.GetContext()
-	_, err := contractKeeper.Execute(ctxB, outpostAddr, initializer, []byte(swapMsg), sdk.NewCoins(sdk.NewCoin(token0IBC, sdk.NewInt(1000))))
+	_, err = contractKeeper.Execute(ctxB, outpostAddr, initializer, []byte(swapMsg), sdk.NewCoins(sdk.NewCoin(token0IBC, sdk.NewInt(1000))))
 	suite.Require().NoError(err)
 	suite.chainB.NextBlock()
 	err = suite.pathAB.EndpointA.UpdateClient()

diff --git a/tests/simulator/sim_test.go b/tests/simulator/sim_test.go
@@ -47,6 +47,7 @@ func TestFullAppSimulation(t *testing.T) {
 }
 
 func fullAppSimulation(tb testing.TB, is_testing bool) {
+	tb.Helper()
 	// TODO: Get SDK simulator fixed to have min fees possible
 	txfeetypes.ConsensusMinFee = sdk.ZeroDec()
 	config, db, logger, cleanup, err := osmosim.SetupSimulation("goleveldb-app-sim", "Simulation")