fix testcases

bnb-chain · Mar 20, 2023 · 095b5ec · 095b5ec
1 parent f2fd571
commit 095b5ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/proto/cosmos/staking/v1beta1/tx.proto b/proto/cosmos/staking/v1beta1/tx.proto
@@ -60,17 +60,10 @@ message MsgCreateValidator {
   google.protobuf.Any      pubkey            = 6 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"];
   cosmos.base.v1beta1.Coin value             = 7 [(gogoproto.nullable) = false];
 
-<<<<<<< HEAD
   string from               = 8 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   string relayer_address    = 9 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   string challenger_address = 10 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   string bls_key            = 11;
-
-=======
-  string from            = 8 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  string relayer_address = 9 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  string relayer_bls_key = 10;
->>>>>>> develop
 }
 
 // MsgCreateValidatorResponse defines the Msg/CreateValidator response type.

diff --git a/x/genutil/client/testutil/suite.go b/x/genutil/client/testutil/suite.go
@@ -69,8 +69,8 @@ func (s *IntegrationTestSuite) TestGenTxCmd() {
 				amount.String(),
 				val.Address.String(),
 				val.Address.String(),
-				blsPk,
 				val.Address.String(),
+				blsPk,
 			},
 			expError: true,
 		},
@@ -82,8 +82,8 @@ func (s *IntegrationTestSuite) TestGenTxCmd() {
 				amount.String(),
 				val.Address.String(),
 				val.Address.String(),
-				blsPk,
 				val.Address.String(),
+				blsPk,
 			},
 			expError: false,
 		},
@@ -96,8 +96,8 @@ func (s *IntegrationTestSuite) TestGenTxCmd() {
 				amount.String(),
 				val.Address.String(),
 				val.Address.String(),
-				blsPk,
 				val.Address.String(),
+				blsPk,
 			},
 			expError: true,
 		},
@@ -110,8 +110,8 @@ func (s *IntegrationTestSuite) TestGenTxCmd() {
 				amount.String(),
 				val.Address.String(),
 				val.Address.String(),
-				blsPk,
 				val.Address.String(),
+				blsPk,
 			},
 			expError: false,
 		},

diff --git a/x/staking/client/testutil/create_validator.go b/x/staking/client/testutil/create_validator.go
@@ -345,8 +345,8 @@ func (s *CreateValidatorTestSuite) createValidatorProposal(valAddr sdk.AccAddres
 		pubKey,
 		from,
 		relayerAddress,
-		blsKey,
 		challengerAddress,
+		blsKey,
 		base64.StdEncoding.EncodeToString(propMetadata),
 		sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens),
 	)