Unify gas adjustment usage for the integration tests. (#840)

CoreumFoundation · May 17, 2024 · 995c66c · 995c66c
1 parent 7ac8916
commit 995c66c
Show file tree

Hide file tree

Showing 20 changed files with 362 additions and 171 deletions.
diff --git a/integration-tests/ibc/asset_ft_test.go b/integration-tests/ibc/asset_ft_test.go
diff --git a/integration-tests/ibc/hooks_test.go b/integration-tests/ibc/hooks_test.go
@@ -72,7 +72,7 @@ func TestIBCHooksCounterWASMCall(t *testing.T) {
 
 	coreumContractAddr, _, err := coreumChain.Wasm.DeployAndInstantiateWASMContract(
 		ctx,
-		coreumChain.TxFactory().WithSimulateAndExecute(true),
+		coreumChain.TxFactoryAuto(),
 		coreumContractAdmin,
 		ibcwasm.IBCHooksCounter,
 		integration.InstantiateConfig{
@@ -95,7 +95,13 @@ func TestIBCHooksCounterWASMCall(t *testing.T) {
 
 	sendToOsmosisCoin := coreumChain.NewCoin(sdkmath.NewInt(10_000_000))
 	_, err = coreumChain.ExecuteIBCTransfer(
-		ctx, t, coreumSender, sendToOsmosisCoin, osmosisChain.ChainContext, osmosisHookCaller1,
+		ctx,
+		t,
+		coreumChain.TxFactory().WithGas(coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{})),
+		coreumSender,
+		sendToOsmosisCoin,
+		osmosisChain.ChainContext,
+		osmosisHookCaller1,
 	)
 	requireT.NoError(err)
 
@@ -121,13 +127,13 @@ func TestIBCHooksCounterWASMCall(t *testing.T) {
 	ibcHookCallerOnCoreumAddr1, err := ibchookskeeper.DeriveIntermediateSender(
 		coreumToOsmosisChannelID,
 		osmosisChain.MustConvertToBech32Address(osmosisHookCaller1),
-		coreumChain.Chain.ChainSettings.AddressPrefix)
+		coreumChain.ChainSettings.AddressPrefix)
 	requireT.NoError(err)
 
 	ibcHookCallerOnCoreumAddr2, err := ibchookskeeper.DeriveIntermediateSender(
 		coreumToOsmosisChannelID,
 		osmosisChain.MustConvertToBech32Address(osmosisHookCaller2),
-		coreumChain.Chain.ChainSettings.AddressPrefix)
+		coreumChain.ChainSettings.AddressPrefix)
 	requireT.NoError(err)
 
 	// Verify that hook caller is separate for each sender address.
@@ -143,6 +149,7 @@ func TestIBCHooksCounterWASMCall(t *testing.T) {
 	_, err = osmosisChain.ExecuteIBCTransferWithMemo(
 		ctx,
 		t,
+		osmosisChain.TxFactoryAuto(),
 		osmosisHookCaller1,
 		sendToCoreumCoin,
 		coreumChain.ChainContext,
@@ -164,6 +171,7 @@ func TestIBCHooksCounterWASMCall(t *testing.T) {
 	_, err = osmosisChain.ExecuteIBCTransferWithMemo(
 		ctx,
 		t,
+		osmosisChain.TxFactoryAuto(),
 		osmosisHookCaller1,
 		sendToCoreumCoin,
 		coreumChain.ChainContext,
@@ -185,6 +193,7 @@ func TestIBCHooksCounterWASMCall(t *testing.T) {
 	_, err = osmosisChain.ExecuteIBCTransferWithMemo(
 		ctx,
 		t,
+		osmosisChain.TxFactoryAuto(),
 		osmosisHookCaller2,
 		sendOsmosisToCoreumCoin,
 		coreumChain.ChainContext,
@@ -239,7 +248,7 @@ func TestIBCHooksCounterWASMCallback(t *testing.T) {
 
 	coreumContractAddr, _, err := coreumChain.Wasm.DeployAndInstantiateWASMContract(
 		ctx,
-		coreumChain.TxFactory().WithSimulateAndExecute(true),
+		coreumChain.TxFactoryAuto(),
 		coreumContractAdmin,
 		ibcwasm.IBCHooksCounter,
 		integration.InstantiateConfig{
@@ -259,9 +268,10 @@ func TestIBCHooksCounterWASMCallback(t *testing.T) {
 	// For more details check: https://github.com/cosmos/ibc-apps/blob/main/modules/ibc-hooks/wasm_hook.go#L228
 	ibcCallbackMemo := fmt.Sprintf(`{"ibc_callback": "%s"}`, coreumContractAddr)
 	sendToOsmosisCoin := coreumChain.NewCoin(sdkmath.NewInt(10_000_000))
-	_, err = coreumChain.Chain.ExecuteIBCTransferWithMemo(
+	_, err = coreumChain.ExecuteIBCTransferWithMemo(
 		ctx,
 		t,
+		coreumChain.TxFactory().WithGas(coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{})),
 		coreumSender,
 		sendToOsmosisCoin,
 		osmosisChain.ChainContext,

diff --git a/integration-tests/ibc/pfm_test.go b/integration-tests/ibc/pfm_test.go
@@ -84,6 +84,7 @@ func TestPFMViaCoreum(t *testing.T) {
 	_, err = osmosisChain.ExecuteIBCTransferWithMemo(
 		ctx,
 		t,
+		osmosisChain.TxFactoryAuto(),
 		osmosisSender,
 		sendToGaiaCoin,
 		coreumChain.ChainContext,

diff --git a/integration-tests/ibc/transfer_test.go b/integration-tests/ibc/transfer_test.go
@@ -51,7 +51,13 @@ func TestIBCTransferFromCoreumToGaiaAndBack(t *testing.T) {
 	})
 
 	txRes, err := coreumChain.ExecuteIBCTransfer(
-		ctx, t, coreumSender, sendToGaiaCoin, gaiaChain.ChainContext, gaiaRecipient,
+		ctx,
+		t,
+		coreumChain.TxFactory().WithGas(coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{})),
+		coreumSender,
+		sendToGaiaCoin,
+		gaiaChain.ChainContext,
+		gaiaRecipient,
 	)
 	requireT.NoError(err)
 	requireT.EqualValues(txRes.GasUsed, coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{}))
@@ -62,7 +68,13 @@ func TestIBCTransferFromCoreumToGaiaAndBack(t *testing.T) {
 	)
 	requireT.NoError(gaiaChain.AwaitForBalance(ctx, t, gaiaRecipient, expectedGaiaRecipientBalance))
 	_, err = gaiaChain.ExecuteIBCTransfer(
-		ctx, t, gaiaRecipient, expectedGaiaRecipientBalance, coreumChain.Chain.ChainContext, coreumSender,
+		ctx,
+		t,
+		gaiaChain.TxFactoryAuto(),
+		gaiaRecipient,
+		expectedGaiaRecipientBalance,
+		coreumChain.Chain.ChainContext,
+		coreumSender,
 	)
 	requireT.NoError(err)
 
@@ -106,7 +118,13 @@ func TestIBCTransferFromGaiaToCoreumAndBack(t *testing.T) {
 
 	// Send from gaiaAccount to coreumToCoreumSender
 	_, err := gaiaChain.ExecuteIBCTransfer(
-		ctx, t, gaiaAccount1, sendToCoreumCoin, coreumChain.Chain.ChainContext, coreumToCoreumSender,
+		ctx,
+		t,
+		gaiaChain.TxFactoryAuto(),
+		gaiaAccount1,
+		sendToCoreumCoin,
+		coreumChain.Chain.ChainContext,
+		coreumToCoreumSender,
 	)
 	requireT.NoError(err)
 
@@ -140,7 +158,13 @@ func TestIBCTransferFromGaiaToCoreumAndBack(t *testing.T) {
 
 	// Send from coreumToGaiaSender back to gaiaAccount
 	_, err = coreumChain.ExecuteIBCTransfer(
-		ctx, t, coreumToGaiaSender, expectedBalanceAtCoreum, gaiaChain.ChainContext, gaiaAccount2,
+		ctx,
+		t,
+		coreumChain.TxFactory().WithGas(coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{})),
+		coreumToGaiaSender,
+		expectedBalanceAtCoreum,
+		gaiaChain.ChainContext,
+		gaiaAccount2,
 	)
 	requireT.NoError(err)
 	expectedGaiaSenderBalance := sdk.NewCoin(sendToCoreumCoin.Denom, expectedBalanceAtCoreum.Amount)
@@ -178,7 +202,13 @@ func TestTimedOutTransfer(t *testing.T) {
 		})
 
 		_, err := coreumChain.ExecuteTimingOutIBCTransfer(
-			ctx, t, coreumSender, sendToOsmosisCoin, osmosisChain.ChainContext, osmosisRecipient,
+			ctx,
+			t,
+			coreumChain.TxFactory().WithGas(coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{})),
+			coreumSender,
+			sendToOsmosisCoin,
+			osmosisChain.ChainContext,
+			osmosisRecipient,
 		)
 		switch {
 		case err == nil:
@@ -276,7 +306,15 @@ func TestRejectedTransfer(t *testing.T) {
 		Amount:  gaiaChain.NewCoin(sdk.NewIntFromUint64(100000)),
 	})
 
-	_, err := coreumChain.ExecuteIBCTransfer(ctx, t, coreumSender, sendToGaiaCoin, gaiaChain.ChainContext, moduleAddress)
+	_, err := coreumChain.ExecuteIBCTransfer(
+		ctx,
+		t,
+		coreumChain.TxFactory().WithGas(coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{})),
+		coreumSender,
+		sendToGaiaCoin,
+		gaiaChain.ChainContext,
+		moduleAddress,
+	)
 	requireT.NoError(err)
 
 	// funds should be returned to coreum
@@ -299,11 +337,27 @@ func TestRejectedTransfer(t *testing.T) {
 	})
 
 	sendToCoreumCoin := sdk.NewCoin(ibcGaiaDenom, sendToGaiaCoin.Amount)
-	_, err = coreumChain.ExecuteIBCTransfer(ctx, t, coreumSender, sendToGaiaCoin, gaiaChain.ChainContext, gaiaRecipient)
+	_, err = coreumChain.ExecuteIBCTransfer(
+		ctx,
+		t,
+		coreumChain.TxFactory().WithGas(coreumChain.GasLimitByMsgs(&ibctransfertypes.MsgTransfer{})),
+		coreumSender,
+		sendToGaiaCoin,
+		gaiaChain.ChainContext,
+		gaiaRecipient,
+	)
 	requireT.NoError(err)
 	requireT.NoError(gaiaChain.AwaitForBalance(ctx, t, gaiaRecipient, sendToCoreumCoin))
 
-	_, err = gaiaChain.ExecuteIBCTransfer(ctx, t, gaiaRecipient, sendToCoreumCoin, coreumChain.ChainContext, moduleAddress)
+	_, err = gaiaChain.ExecuteIBCTransfer(
+		ctx,
+		t,
+		gaiaChain.TxFactoryAuto(),
+		gaiaRecipient,
+		sendToCoreumCoin,
+		coreumChain.ChainContext,
+		moduleAddress,
+	)
 	requireT.NoError(err)
 
 	// funds should be returned to gaia

diff --git a/integration-tests/ibc/wasm_test.go b/integration-tests/ibc/wasm_test.go
@@ -94,7 +94,7 @@ func TestIBCTransferFromSmartContract(t *testing.T) {
 	// deploy the contract and fund it
 	contractAddr, _, err := coreumChain.Wasm.DeployAndInstantiateWASMContract(
 		ctx,
-		coreumChain.TxFactory().WithSimulateAndExecute(true),
+		coreumChain.TxFactoryAuto(),
 		coreumAdmin,
 		ibcwasm.IBCTransferWASM,
 		integration.InstantiateConfig{
@@ -139,7 +139,7 @@ func TestIBCTransferFromSmartContract(t *testing.T) {
 
 	_, err = coreumChain.Wasm.ExecuteWASMContract(
 		ctx,
-		coreumChain.TxFactory().WithSimulateAndExecute(true),
+		coreumChain.TxFactoryAuto(),
 		coreumAdmin,
 		contractAddr,
 		transferPayload,
@@ -195,7 +195,7 @@ func TestIBCCallFromSmartContract(t *testing.T) {
 
 	coreumContractAddr, _, err := coreumChain.Wasm.DeployAndInstantiateWASMContract(
 		ctx,
-		coreumChain.TxFactory().WithSimulateAndExecute(true),
+		coreumChain.TxFactoryAuto(),
 		coreumCaller,
 		ibcwasm.IBCCallWASM,
 		integration.InstantiateConfig{
@@ -209,7 +209,7 @@ func TestIBCCallFromSmartContract(t *testing.T) {
 
 	osmosisContractAddr, _, err := osmosisChain.Wasm.DeployAndInstantiateWASMContract(
 		ctx,
-		osmosisChain.TxFactory().WithSimulateAndExecute(true),
+		osmosisChain.TxFactoryAuto(),
 		osmosisCaller,
 		ibcwasm.IBCCallWASM,
 		integration.InstantiateConfig{
@@ -303,7 +303,7 @@ func executeWasmIncrement(
 
 	_, err = chain.Wasm.ExecuteWASMContract(
 		ctx,
-		chain.TxFactory().WithSimulateAndExecute(true),
+		chain.TxFactoryAuto(),
 		caller,
 		contractAddr,
 		incrementPayload,

diff --git a/integration-tests/init.go b/integration-tests/init.go
@@ -161,7 +161,6 @@ func NewChainsTestingContext(t *testing.T) (context.Context, Chains) {
 		require.NoError(t, err)
 		gaiaSettings := integration.QueryChainSettings(queryCtx, gaiaGRPClient)
 		gaiaSettings.GasPrice = sdk.MustNewDecFromStr("0.01")
-		gaiaSettings.GasAdjustment = 1.5
 		gaiaSettings.CoinType = sdk.CoinType // gaia coin type
 		gaiaSettings.RPCAddress = gaiaRPCAddress
 
@@ -182,7 +181,6 @@ func NewChainsTestingContext(t *testing.T) (context.Context, Chains) {
 		require.NoError(t, err)
 		osmosisChainSettings := integration.QueryChainSettings(queryCtx, osmosisGRPClient)
 		osmosisChainSettings.GasPrice = sdk.MustNewDecFromStr("0.01")
-		osmosisChainSettings.GasAdjustment = 1.5
 		osmosisChainSettings.CoinType = sdk.CoinType // osmosis coin type
 		osmosisChainSettings.RPCAddress = osmosisRPCAddress