Merge PR: fix ut (#15)

* fix ut * fix ut of evm * fix ibc-go ut * change to okbchain * fix rpc ut * fix app ut * fix ut * fix inner tx ut * make ut buildable in x module * fix wasm ut * modify distr * update default minSelfDelegation for ut * fix staking * fix staking ut * fix distr ut * fix staking ut * fix ut * fix app ut * fix evidence ut * fix ibc ut * update tm ut * fix ut of evm types * fix BeginBlock * fix evm ut * fix ut of evm keeper * fix ut of evm types * fix ut of evm * fix evm ut * add gitignore * update gitignore * update * fix panic * fix UT * disable crisis * fix cosmos ut * update gitignore * fix ibc ut * ignore invariant ut * delete useless file * bad read is not necessary --------- Co-authored-by: KamiD <[email protected]> Co-authored-by: jianguo <[email protected]> Co-authored-by: evan.han <[email protected]> Co-authored-by: gerald.li <[email protected]> Co-authored-by: ylsGit <[email protected]> Co-authored-by: itsfunny <[email protected]>
okx · Mar 9, 2023 · f04359a · f04359a
1 parent 80cbbd6
commit f04359a
Show file tree

Hide file tree

Showing 97 changed files with 652 additions and 5,261 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,24 @@ cmd/exchaind/testnet_okchain.go
 dev/testnet/cache
 testnet_exchain.go
 tools
+x/vmbridge/keeper/data/*
+libs/ibc-go/modules/apps/27-interchain-accounts/controller/data/*
+libs/ibc-go/modules/apps/27-interchain-accounts/controller/keeper/data/*
+libs/ibc-go/modules/apps/27-interchain-accounts/host/data/*
+libs/ibc-go/modules/apps/27-interchain-accounts/host/keeper/data/*
+libs/ibc-go/modules/apps/27-interchain-accounts/types/data/*
+libs/ibc-go/modules/apps/29-fee/data/*
+libs/ibc-go/modules/apps/29-fee/keeper/data/*
+libs/ibc-go/modules/apps/transfer/data/*
+libs/ibc-go/modules/apps/transfer/keeper/data/*
+libs/ibc-go/modules/core/02-client/keeper/data/*
+libs/ibc-go/modules/core/02-client/types/data/*
+libs/ibc-go/modules/core/03-connection/keeper/data/*
+libs/ibc-go/modules/core/04-channel/keeper/data/*
+libs/ibc-go/modules/core/ante/data/*
+libs/ibc-go/modules/core/keeper/data/*
+libs/ibc-go/modules/light-clients/07-tendermint/types/data/*
+
 
 
 # Testing

diff --git a/app/app_test.go b/app/app_test.go
@@ -200,9 +200,10 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
 				tx.Sign(evmChainID, suite.evmSenderPrivKey.ToECDSA())
 				txBytes, err := authclient.GetTxEncoder(nil, authclient.WithEthereumTx())(tx)
 				suite.Require().NoError(err)
+
 				return txBytes
 			},
-			7, //invalid opcode: opcode 0xa6 not defined: failed to execute message; message index: 0
+			abci.CodeTypeNonceInc + 7, //invalid opcode: opcode 0xa6 not defined: failed to execute message; message index: 0
 			1000000,
 		},
 		{
@@ -233,7 +234,7 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
 				txBytes, _ := authclient.GetTxEncoder(nil, authclient.WithEthereumTx())(tx)
 				return txBytes
 			},
-			7, //execution reverted: failed to execute message; message index: 0
+			abci.CodeTypeNonceInc + 7, //execution reverted: failed to execute message; message index: 0
 			21195,
 		},
 		{
@@ -250,7 +251,7 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
 				return txBytes
 			},
 			0,
-			159669,
+			161071,
 		},
 		{
 			"send tx for gov with error fee, failed, do not write to block",
@@ -281,8 +282,8 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
 				txBytes, _ := txEncoder(tx)
 				return txBytes
 			},
-			68007, //the status of proposal is not for this operation: failed to execute message; message index: 1
-			121641,
+			abci.CodeTypeNonceInc + 68007, //the status of proposal is not for this operation: failed to execute message; message index: 1
+			122596,
 		},
 		{
 			"send std tx for gov again with proposal id 2, success",
@@ -298,7 +299,7 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
 				return txBytes
 			},
 			0,
-			154279,
+			154919,
 		},
 	}