Skip to content

Commit f04359a

Browse files
yann-sjtuKamiDzjg555543iloverslisuxiaoqi
authored
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]>
1 parent 80cbbd6 commit f04359a

File tree

97 files changed

+652
-5261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+652
-5261
lines changed

.gitignore

+18
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,24 @@ cmd/exchaind/testnet_okchain.go
4545
dev/testnet/cache
4646
testnet_exchain.go
4747
tools
48+
x/vmbridge/keeper/data/*
49+
libs/ibc-go/modules/apps/27-interchain-accounts/controller/data/*
50+
libs/ibc-go/modules/apps/27-interchain-accounts/controller/keeper/data/*
51+
libs/ibc-go/modules/apps/27-interchain-accounts/host/data/*
52+
libs/ibc-go/modules/apps/27-interchain-accounts/host/keeper/data/*
53+
libs/ibc-go/modules/apps/27-interchain-accounts/types/data/*
54+
libs/ibc-go/modules/apps/29-fee/data/*
55+
libs/ibc-go/modules/apps/29-fee/keeper/data/*
56+
libs/ibc-go/modules/apps/transfer/data/*
57+
libs/ibc-go/modules/apps/transfer/keeper/data/*
58+
libs/ibc-go/modules/core/02-client/keeper/data/*
59+
libs/ibc-go/modules/core/02-client/types/data/*
60+
libs/ibc-go/modules/core/03-connection/keeper/data/*
61+
libs/ibc-go/modules/core/04-channel/keeper/data/*
62+
libs/ibc-go/modules/core/ante/data/*
63+
libs/ibc-go/modules/core/keeper/data/*
64+
libs/ibc-go/modules/light-clients/07-tendermint/types/data/*
65+
4866

4967

5068
# Testing

app/app_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,10 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
200200
tx.Sign(evmChainID, suite.evmSenderPrivKey.ToECDSA())
201201
txBytes, err := authclient.GetTxEncoder(nil, authclient.WithEthereumTx())(tx)
202202
suite.Require().NoError(err)
203+
203204
return txBytes
204205
},
205-
7, //invalid opcode: opcode 0xa6 not defined: failed to execute message; message index: 0
206+
abci.CodeTypeNonceInc + 7, //invalid opcode: opcode 0xa6 not defined: failed to execute message; message index: 0
206207
1000000,
207208
},
208209
{
@@ -233,7 +234,7 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
233234
txBytes, _ := authclient.GetTxEncoder(nil, authclient.WithEthereumTx())(tx)
234235
return txBytes
235236
},
236-
7, //execution reverted: failed to execute message; message index: 0
237+
abci.CodeTypeNonceInc + 7, //execution reverted: failed to execute message; message index: 0
237238
21195,
238239
},
239240
{
@@ -250,7 +251,7 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
250251
return txBytes
251252
},
252253
0,
253-
159669,
254+
161071,
254255
},
255256
{
256257
"send tx for gov with error fee, failed, do not write to block",
@@ -281,8 +282,8 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
281282
txBytes, _ := txEncoder(tx)
282283
return txBytes
283284
},
284-
68007, //the status of proposal is not for this operation: failed to execute message; message index: 1
285-
121641,
285+
abci.CodeTypeNonceInc + 68007, //the status of proposal is not for this operation: failed to execute message; message index: 1
286+
122596,
286287
},
287288
{
288289
"send std tx for gov again with proposal id 2, success",
@@ -298,7 +299,7 @@ func (suite *FakeBlockTxTestSuite) TestFakeBlockTx() {
298299
return txBytes
299300
},
300301
0,
301-
154279,
302+
154919,
302303
},
303304
}
304305

0 commit comments

Comments
 (0)