fix: unit test

baseapp/abci_test.go

@@ -229,6 +229,15 @@ func TestABCI_P2PQuery(t *testing.T) {
 
 	suite := NewBaseAppSuite(t, addrPeerFilterOpt, idPeerFilterOpt)
 
+	// As the modified handleQueryP2P needs a query context, the lastBlockHeight
+	// must not be zero. Therefore, we initiate the chain and commit one block here.
+	suite.baseApp.InitChain(abci.RequestInitChain{
+		ConsensusParams: &tmproto.ConsensusParams{},
+	})
+	header := tmproto.Header{Height: suite.baseApp.LastBlockHeight() + 1}
+	suite.baseApp.BeginBlock(abci.RequestBeginBlock{Header: header})
+	suite.baseApp.Commit()
+
 	addrQuery := abci.RequestQuery{
 		Path: "/p2p/filter/addr/1.1.1.1:8000",
 	}

baseapp/block_gas_test.go

@@ -166,7 +166,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
 				require.Equal(t, []byte("ok"), okValue)
 			}
 			// check block gas is always consumed
-			baseGas := uint64(51732) // baseGas is the gas consumed before tx msg
+			baseGas := uint64(51759) // baseGas is the gas consumed before tx msg
 			expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas)
 			if expGasConsumed > txtypes.MaxGasWanted {
 				// capped by gasLimit

baseapp/options.go

@@ -167,9 +167,9 @@ func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) {
 }
 
 func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
-	//if app.sealed {
-	//	panic("SetAnteHandler() on sealed BaseApp")
-	//}
+	if app.sealed {
+		panic("SetAnteHandler() on sealed BaseApp")
+	}
 
 	app.anteHandler = ah
 }

x/auth/keeper/deterministic_test.go

@@ -193,6 +193,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryParameters() {
 			rapid.Uint64Min(1).Draw(t, "tx-size-cost-per-byte"),
 			rapid.Uint64Min(1).Draw(t, "sig-verify-cost-ed25519"),
 			rapid.Uint64Min(1).Draw(t, "sig-verify-cost-Secp256k1"),
+			rapid.Uint64Min(1).Draw(t, "sig-verify-cost-Sm2"),
 		)
 		err := suite.accountKeeper.SetParams(suite.ctx, params)
 		suite.Require().NoError(err)
@@ -202,13 +203,13 @@ func (suite *DeterministicTestSuite) TestGRPCQueryParameters() {
 	})
 
 	// Regression test
-	params := types.NewParams(15, 167, 100, 1, 21457)
+	params := types.NewParams(15, 167, 100, 1, 21457, 7850)
 
 	err := suite.accountKeeper.SetParams(suite.ctx, params)
 	suite.Require().NoError(err)
 
 	req := &types.QueryParamsRequest{}
-	testdata.DeterministicIterations(suite.ctx, suite.Require(), req, suite.queryClient.Params, 1042, false)
+	testdata.DeterministicIterations(suite.ctx, suite.Require(), req, suite.queryClient.Params, 1051, true)
 }
 
 func (suite *DeterministicTestSuite) TestGRPCQueryAccountInfo() {

x/auth/keeper/keeper_test.go

@@ -172,6 +172,7 @@ func (suite *KeeperTestSuite) TestInitGenesis() {
 			TxSizeCostPerByte:      types.DefaultTxSizeCostPerByte + 1,
 			SigVerifyCostED25519:   types.DefaultSigVerifyCostED25519 + 1,
 			SigVerifyCostSecp256k1: types.DefaultSigVerifyCostSecp256k1 + 1,
+			SigVerifyCostSm2:       types.DefaultSigVerifyCostSm2 + 1,
 		},
 	}
 

x/auth/keeper/msg_server_test.go

@@ -29,6 +29,7 @@ func (s *KeeperTestSuite) TestUpdateParams() {
 					TxSizeCostPerByte:      5,
 					SigVerifyCostED25519:   694,
 					SigVerifyCostSecp256k1: 511,
+					SigVerifyCostSm2:       100,
 				},
 			},
 			expectErr: true,
@@ -44,6 +45,7 @@ func (s *KeeperTestSuite) TestUpdateParams() {
 					TxSizeCostPerByte:      5,
 					SigVerifyCostED25519:   694,
 					SigVerifyCostSecp256k1: 511,
+					SigVerifyCostSm2:       100,
 				},
 			},
 			expectErr: true,
@@ -59,6 +61,7 @@ func (s *KeeperTestSuite) TestUpdateParams() {
 					TxSizeCostPerByte:      0,
 					SigVerifyCostED25519:   694,
 					SigVerifyCostSecp256k1: 511,
+					SigVerifyCostSm2:       100,
 				},
 			},
 			expectErr: true,
@@ -74,6 +77,7 @@ func (s *KeeperTestSuite) TestUpdateParams() {
 					TxSizeCostPerByte:      5,
 					SigVerifyCostED25519:   0,
 					SigVerifyCostSecp256k1: 511,
+					SigVerifyCostSm2:       100,
 				},
 			},
 			expectErr: true,
@@ -89,11 +93,28 @@ func (s *KeeperTestSuite) TestUpdateParams() {
 					TxSizeCostPerByte:      5,
 					SigVerifyCostED25519:   694,
 					SigVerifyCostSecp256k1: 0,
+					SigVerifyCostSm2:       100,
 				},
 			},
 			expectErr: true,
 			expErrMsg: "invalid SECK256k1 signature verification cost",
 		},
+		{
+			name: "set invalid sig verify cost Sm2",
+			req: &types.MsgUpdateParams{
+				Authority: s.accountKeeper.GetAuthority(),
+				Params: types.Params{
+					MaxMemoCharacters:      140,
+					TxSigLimit:             9,
+					TxSizeCostPerByte:      5,
+					SigVerifyCostED25519:   694,
+					SigVerifyCostSecp256k1: 511,
+					SigVerifyCostSm2:       0,
+				},
+			},
+			expectErr: true,
+			expErrMsg: "invalid Sm2 signature verification cost",
+		},
 	}
 
 	for _, tc := range testCases {

x/auth/keeper/params_test.go

@@ -19,6 +19,7 @@ func (s *KeeperTestSuite) TestParams() {
 				TxSizeCostPerByte:      5,
 				SigVerifyCostED25519:   694,
 				SigVerifyCostSecp256k1: 511,
+				SigVerifyCostSm2:       100,
 			},
 			expectErr: true,
 			expErrMsg: "invalid max memo characters",
@@ -31,6 +32,7 @@ func (s *KeeperTestSuite) TestParams() {
 				TxSizeCostPerByte:      5,
 				SigVerifyCostED25519:   694,
 				SigVerifyCostSecp256k1: 511,
+				SigVerifyCostSm2:       100,
 			},
 			expectErr: true,
 			expErrMsg: "invalid tx signature limit",
@@ -43,6 +45,7 @@ func (s *KeeperTestSuite) TestParams() {
 				TxSizeCostPerByte:      0,
 				SigVerifyCostED25519:   694,
 				SigVerifyCostSecp256k1: 511,
+				SigVerifyCostSm2:       100,
 			},
 			expectErr: true,
 			expErrMsg: "invalid tx size cost per byte",
@@ -55,6 +58,7 @@ func (s *KeeperTestSuite) TestParams() {
 				TxSizeCostPerByte:      5,
 				SigVerifyCostED25519:   0,
 				SigVerifyCostSecp256k1: 511,
+				SigVerifyCostSm2:       100,
 			},
 			expectErr: true,
 			expErrMsg: "invalid ED25519 signature verification cost",
@@ -67,10 +71,24 @@ func (s *KeeperTestSuite) TestParams() {
 				TxSizeCostPerByte:      5,
 				SigVerifyCostED25519:   694,
 				SigVerifyCostSecp256k1: 0,
+				SigVerifyCostSm2:       100,
 			},
 			expectErr: true,
 			expErrMsg: "invalid SECK256k1 signature verification cost",
 		},
+		{
+			name: "set invalid sig verify cost Sm2",
+			input: types.Params{
+				MaxMemoCharacters:      140,
+				TxSigLimit:             9,
+				TxSizeCostPerByte:      5,
+				SigVerifyCostED25519:   694,
+				SigVerifyCostSecp256k1: 511,
+				SigVerifyCostSm2:       0,
+			},
+			expectErr: true,
+			expErrMsg: "invalid Sm2 signature verification cost",
+		},
 	}
 	for _, tc := range testCases {
 		tc := tc

x/auth/types/params_test.go

@@ -30,7 +30,9 @@ func TestParams_Validate(t *testing.T) {
 		{"invalid ED25519 signature verification cost", types.NewParams(types.DefaultMaxMemoCharacters, types.DefaultTxSigLimit, types.DefaultTxSizeCostPerByte,
 			0, types.DefaultSigVerifyCostSecp256k1, types.DefaultSigVerifyCostSm2), fmt.Errorf("invalid ED25519 signature verification cost: 0")},
 		{"invalid SECK256k1 signature verification cost", types.NewParams(types.DefaultMaxMemoCharacters, types.DefaultTxSigLimit, types.DefaultTxSizeCostPerByte,
-			types.DefaultSigVerifyCostED25519, types.DefaultSigVerifyCostSm2, 0), fmt.Errorf("invalid SECK256k1 signature verification cost: 0")},
+			types.DefaultSigVerifyCostED25519, 0, types.DefaultSigVerifyCostSm2), fmt.Errorf("invalid SECK256k1 signature verification cost: 0")},
+		{"invalid SM2 signature verification cost", types.NewParams(types.DefaultMaxMemoCharacters, types.DefaultTxSigLimit, types.DefaultTxSizeCostPerByte,
+			types.DefaultSigVerifyCostED25519, types.DefaultSigVerifyCostSm2, 0), fmt.Errorf("invalid Sm2 signature verification cost: 0")},
 		{"invalid max memo characters", types.NewParams(0, types.DefaultTxSigLimit, types.DefaultTxSizeCostPerByte,
 			types.DefaultSigVerifyCostED25519, types.DefaultSigVerifyCostSecp256k1, types.DefaultSigVerifyCostSm2), fmt.Errorf("invalid max memo characters: 0")},
 		{"invalid tx size cost per byte", types.NewParams(types.DefaultMaxMemoCharacters, types.DefaultTxSigLimit, 0,