imp: increased gas for ExecCreateChannel

srdtrk · Oct 28, 2023 · 609416a · 609416a
1 parent 40aa99a
commit 609416a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/e2e/interchaintest/contract_test.go b/e2e/interchaintest/contract_test.go
@@ -142,7 +142,7 @@ func (s *ContractTestSuite) TestIcaContractInstantiatedChannelHandshake() {
 	// Instantiate the contract with channel:
 	instantiateMsg := types.NewInstantiateMsgWithChannelInitOptions(nil, s.ChainAConnID, s.ChainBConnID, nil, nil)
 
-	contractAddr, err := wasmd.InstantiateContract(ctx, wasmdUser.KeyName(), codeId, instantiateMsg, true, "--gas", "1000000")
+	contractAddr, err := wasmd.InstantiateContract(ctx, wasmdUser.KeyName(), codeId, instantiateMsg, true, "--gas", "500000")
 	s.Require().NoError(err)
 
 	s.Contract = types.NewContract(contractAddr, codeId, wasmd)
@@ -221,7 +221,7 @@ func (s *ContractTestSuite) TestRecoveredIcaContractInstantiatedChannelHandshake
 		// Instantiate the contract with channel:
 		instantiateMsg := types.NewInstantiateMsgWithChannelInitOptions(nil, "invalid", s.ChainBConnID, nil, nil)
 
-		_, err = wasmd.InstantiateContract(ctx, wasmdUser.KeyName(), codeId, instantiateMsg, true, "--gas", "2000000")
+		_, err = wasmd.InstantiateContract(ctx, wasmdUser.KeyName(), codeId, instantiateMsg, true, "--gas", "500000")
 		s.Require().ErrorContains(err, "submessages: invalid connection hop ID")
 	})
 
@@ -231,14 +231,14 @@ func (s *ContractTestSuite) TestRecoveredIcaContractInstantiatedChannelHandshake
 
 		// unfortunately, this doesn't error out because the connection id is in the counterparty.
 		// instead, the handshake never completes. A new channel may be created by the relayer.
-		contractAddr, err := wasmd.InstantiateContract(ctx, wasmdUser.KeyName(), codeId, instantiateMsg, true, "--gas", "2000000")
+		contractAddr, err := wasmd.InstantiateContract(ctx, wasmdUser.KeyName(), codeId, instantiateMsg, true, "--gas", "500000")
 		s.Require().NoError(err)
 
 		s.Contract = types.NewContract(contractAddr, codeId, wasmd)
 	})
 
 	s.Run("TestChannelHandshakeSuccessAfterFail", func() {
-		err = s.Contract.ExecCreateChannel(ctx, wasmdUser.KeyName(), s.ChainAConnID, s.ChainBConnID, nil, nil)
+		err = s.Contract.ExecCreateChannel(ctx, wasmdUser.KeyName(), s.ChainAConnID, s.ChainBConnID, nil, nil, "--gas", "500000")
 		s.Require().NoError(err)
 
 		// Wait for the channel to get set up

diff --git a/e2e/interchaintest/types/contract.go b/e2e/interchaintest/types/contract.go
@@ -48,10 +48,11 @@ func (c *Contract) Port() string {
 
 func (c *Contract) ExecCreateChannel(
 	ctx context.Context, callerKeyName string, connectionId string,
-	counterpartyConnectionId string, counterpartyPortId *string, txEncoding *string,
+	counterpartyConnectionId string, counterpartyPortId *string,
+	txEncoding *string, extraExecTxArgs ...string,
 ) error {
 	msg := NewCreateChannelMsg(connectionId, counterpartyConnectionId, counterpartyPortId, txEncoding)
-	err := c.Execute(ctx, callerKeyName, msg)
+	err := c.Execute(ctx, callerKeyName, msg, extraExecTxArgs...)
 	return err
 }
 
@@ -72,8 +73,8 @@ func (c *Contract) ExecPredefinedAction(ctx context.Context, callerKeyName strin
 	return err
 }
 
-func (c *Contract) Execute(ctx context.Context, callerKeyName string, execMsg string) error {
-	_, err := c.chain.ExecuteContract(ctx, callerKeyName, c.Address, execMsg)
+func (c *Contract) Execute(ctx context.Context, callerKeyName string, execMsg string, extraExecTxArgs ...string) error {
+	_, err := c.chain.ExecuteContract(ctx, callerKeyName, c.Address, execMsg, extraExecTxArgs...)
 	return err
 }