Disable gas checks in tests

Author: alpe

x/wasm/internal/keeper/keeper_test.go

@@ -278,7 +278,9 @@ func TestInstantiate(t *testing.T) {
 	require.Equal(t, "cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5", contractAddr.String())
 
 	gasAfter := ctx.GasMeter().GasConsumed()
-	require.Equal(t, uint64(0x118c2), gasAfter-gasBefore)
+	if types.EnableGasVerification {
+		require.Equal(t, uint64(0x118c2), gasAfter-gasBefore)
+	}
 
 	// ensure it is stored properly
 	info := keeper.GetContractInfo(ctx, contractAddr)
@@ -507,8 +509,9 @@ func TestExecute(t *testing.T) {
 
 	// make sure gas is properly deducted from ctx
 	gasAfter := ctx.GasMeter().GasConsumed()
-	require.Equal(t, uint64(0x11d8c), gasAfter-gasBefore)
-
+	if types.EnableGasVerification {
+		require.Equal(t, uint64(0x11d8c), gasAfter-gasBefore)
+	}
 	// ensure bob now exists and got both payments released
 	bobAcct = accKeeper.GetAccount(ctx, bob)
 	require.NotNil(t, bobAcct)

x/wasm/internal/keeper/recurse_test.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"encoding/json"
+	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	"testing"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
@@ -126,8 +127,9 @@ func TestGasCostOnQuery(t *testing.T) {
 			require.NoError(t, err)
 
 			// check the gas is what we expected
-			assert.Equal(t, tc.expectedGas, ctx.GasMeter().GasConsumed())
-
+			if types.EnableGasVerification {
+				assert.Equal(t, tc.expectedGas, ctx.GasMeter().GasConsumed())
+			}
 			// assert result is 32 byte sha256 hash (if hashed), or contractAddr if not
 			var resp recurseResponse
 			err = json.Unmarshal(data, &resp)
@@ -297,8 +299,9 @@ func TestLimitRecursiveQueryGas(t *testing.T) {
 			// otherwise, we expect a successful call
 			_, err := keeper.QuerySmart(ctx, contractAddr, msg)
 			require.NoError(t, err)
-			assert.Equal(t, tc.expectedGas, ctx.GasMeter().GasConsumed())
-
+			if types.EnableGasVerification {
+				assert.Equal(t, tc.expectedGas, ctx.GasMeter().GasConsumed())
+			}
 			assert.Equal(t, tc.expectQueriesFromContract, totalWasmQueryCounter)
 		})
 	}

x/wasm/internal/types/feature_flag.go

@@ -0,0 +1,4 @@
+package types
+
+// Tests should not fail on gas consumption
+const EnableGasVerification = false

x/wasm/relay_test.go

@@ -24,13 +24,13 @@ import (
 )
 
 func TestFromIBCTransferToContract(t *testing.T) {
-	t.Skip("Not fixed, yet")
 	// scenario: a contract can handle the receiving side of a ibc transfer
 	var (
 		coordinator = ibctesting.NewCoordinator(t, 2)
 		chainA      = coordinator.GetChain(ibctesting.GetChainID(0))
 		chainB      = coordinator.GetChain(ibctesting.GetChainID(1))
 	)
+	coordinator.CommitBlock(chainA, chainB)
 	myContractAddr := chainB.NewRandomContractInstance()
 	wasmkeeper.MockContracts[myContractAddr.String()] = &receiverContract{t: t, contractAddr: myContractAddr, chain: chainB}
 
@@ -62,12 +62,13 @@ func TestFromIBCTransferToContract(t *testing.T) {
 	require.NoError(t, err)
 	newBalance := wasmd.NewTestSupport(t, chainA.App).BankKeeper().GetBalance(chainA.GetContext(), chainA.SenderAccount.GetAddress(), sdk.DefaultBondDenom)
 	assert.Equal(t, originalBalance.Sub(coinToSendToB), newBalance)
-	const ibcVoucherTicker = "ibc/BD392476EF223E2AEB996E1F57EAF98E89D4CD44D9FDEB7F9FEDDCC8027703AC"
+
+	voucherDenom := ibctransfertypes.ParseDenomTrace(ibctransfertypes.GetPrefixedDenom(channelB.PortID, channelB.ID, coinToSendToB.Denom)).IBCDenom()
 	bankKeeperB := wasmd.NewTestSupport(t, chainB.App).BankKeeper()
-	chainBBalance := bankKeeperB.GetBalance(chainB.GetContext(), chainB.SenderAccount.GetAddress(), ibcVoucherTicker)
+	chainBBalance := bankKeeperB.GetBalance(chainB.GetContext(), chainB.SenderAccount.GetAddress(), voucherDenom)
 	// note: the contract is called during check and deliverTX but the context used in the contract does not rollback
 	// so that we got twice the amount
-	assert.Equal(t, sdk.Coin{Denom: ibcVoucherTicker, Amount: coinToSendToB.Amount.Mul(sdk.NewInt(2))}.String(), chainBBalance.String(), bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress()))
+	assert.Equal(t, sdk.Coin{Denom: voucherDenom, Amount: coinToSendToB.Amount.Mul(sdk.NewInt(2))}.String(), chainBBalance.String(), bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress()))
 }
 
 func TestContractCanUseIBCTransferMsg(t *testing.T) {