fix issues

Author: wllmshao

tests/e2e/chain.go

@@ -33,6 +33,8 @@ import (
 	gaia "github.com/cosmos/gaia/v23/app"
 	gaiaparams "github.com/cosmos/gaia/v23/app/params"
 	metaprotocoltypes "github.com/cosmos/gaia/v23/x/metaprotocols/types"
+
+	wasmclienttypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 )
 
 const (
@@ -64,6 +66,7 @@ func init() {
 	providertypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	metaprotocoltypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	ratelimittypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	wasmclienttypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
 	cdc = encodingConfig.Marshaler
 	txConfig = encodingConfig.TxConfig

tests/e2e/e2e_exec_test.go

@@ -370,7 +370,7 @@ func (s *IntegrationTestSuite) runGovExec(c *chain, valIdx int, submitterAddr, g
 
 	generalFlags := []string{
 		fmt.Sprintf("--%s=%s", flags.FlagFrom, submitterAddr),
-		fmt.Sprintf("--%s=%s", flags.FlagGas, "400000"), // default 200000 isn't enough
+		fmt.Sprintf("--%s=%s", flags.FlagGas, "50000000"), // default 200000 isn't enough
 		fmt.Sprintf("--%s=%s", flags.FlagGasPrices, fees),
 		fmt.Sprintf("--%s=%s", flags.FlagChainID, c.id),
 		"--keyring-backend=test",

tests/e2e/e2e_wasm_light_client_test.go

@@ -7,13 +7,12 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/gaia/v23/tests/e2e/data"
 )
 
 const (
-	proposalStoreWasmLightClientFilename  = "proposal_store_wasm_light_client.json"
-	wasmLightClientStateFilename          = "wasm_light_client_state.json"
-	wasmLightClientConsensusStateFilename = "wasm_light_client_consensus_state.json"
+	proposalStoreWasmLightClientFilename = "proposal_store_wasm_light_client.json"
 )
 
 func (s *IntegrationTestSuite) testStoreWasmLightClient() {
@@ -39,7 +38,7 @@ func (s *IntegrationTestSuite) testStoreWasmLightClient() {
 			res, err := queryIbcWasmChecksums(chainEndpoint)
 			s.Require().NoError(err)
 			s.Require().NotNil(res)
-			s.Require().Equal(len(res), 1)
+			s.Require().Equal(1, len(res))
 
 			return true
 		},
@@ -52,20 +51,33 @@ func (s *IntegrationTestSuite) testCreateWasmLightClient() {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
-	s.writeClientAndConsensusState(s.chainA)
+	valIdx := 0
+	val := s.chainA.validators[valIdx]
+	address, _ := val.keyInfo.GetAddress()
+	sender := address.String()
+
+	clientState := `{"@type":"/ibc.lightclients.wasm.v1.ClientState","data":"ZG9lc250IG1hdHRlcg==","checksum":"O45STPnbLLar4DtFwDx0dE6tuXQW5XTKPHpbjaugun4=","latest_height":{"revision_number":"0","revision_height":"7795583"}}`
+	consensusState := `{"@type":"/ibc.lightclients.wasm.v1.ConsensusState","data":"ZG9lc250IG1hdHRlcg=="}`
 
 	cmd := []string{
 		gaiadBinary,
 		txCommand,
 		"ibc",
 		"client",
 		"create",
-		wasmLightClientStateFilename,
-		wasmLightClientConsensusStateFilename,
+		clientState,
+		consensusState,
+		fmt.Sprintf("--from=%s", sender),
+		fmt.Sprintf("--%s=%s", flags.FlagFees, standardFees.String()),
+		fmt.Sprintf("--%s=%s", flags.FlagChainID, s.chainA.id),
+		"--keyring-backend=test",
+		"--broadcast-mode=sync",
+		"--output=json",
+		"-y",
 	}
 
 	s.T().Logf("Creating wasm light client on chain %s", s.chainA.id)
-	s.executeGaiaTxCommand(ctx, s.chainA, cmd, 0, s.defaultExecValidation(s.chainA, 0))
+	s.executeGaiaTxCommand(ctx, s.chainA, cmd, valIdx, s.defaultExecValidation(s.chainA, valIdx))
 	s.T().Log("successfully created wasm light client")
 }
 
@@ -92,14 +104,3 @@ func (s *IntegrationTestSuite) writeStoreWasmLightClientProposal(c *chain) {
 	err := writeFile(filepath.Join(c.validators[0].configDir(), "config", proposalStoreWasmLightClientFilename), []byte(propMsgBody))
 	s.Require().NoError(err)
 }
-
-func (s *IntegrationTestSuite) writeClientAndConsensusState(c *chain) {
-	clientState := `{"@type":"/ibc.lightclients.wasm.v1.ClientState","data":"ZG9lc250IG1hdHRlcg==","checksum":"O45STPnbLLar4DtFwDx0dE6tuXQW5XTKPHpbjaugun4=","latest_height":{"revision_number":"0","revision_height":"7795583"}}`
-	consensusState := `{"@type":"/ibc.lightclients.wasm.v1.ConsensusState","data":"ZG9lc250IG1hdHRlcg=="}`
-
-	err := writeFile(filepath.Join(c.validators[0].configDir(), "config", wasmLightClientStateFilename), []byte(clientState))
-	s.Require().NoError(err)
-
-	err = writeFile(filepath.Join(c.validators[0].configDir(), "config", wasmLightClientConsensusStateFilename), []byte(consensusState))
-	s.Require().NoError(err)
-}