Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit 6575ebc

Browse files
author
adria0
committed
update to last eth/test develop
1 parent 05e7f78 commit 6575ebc

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎ethcore/res/ethereum/tests

Submodule tests updated 10361 files

‎ethcore/res/ethereum/tests-issues/currents.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44
"reference": "Issue https://github.com/openethereum/openethereum/issues/11616",
55
"failing": "bcFrontierToHomestead",
66
"subtests": [
7-
"blockChainFrontierWithLargerTDvsHomesteadBlockchain2",
8-
"UncleFromFrontierInHomestead",
9-
"UnclePopulation",
10-
"blockChainFrontierWithLargerTDvsHomesteadBlockchain",
11-
"HomesteadOverrideFrontier",
12-
"CallContractThatCreateContractBeforeAndAfterSwitchover",
13-
"ContractCreationFailsOnHomestead"
7+
"blockChainFrontierWithLargerTDvsHomesteadBlockchain2_FrontierToHomesteadAt5",
8+
"UncleFromFrontierInHomestead_FrontierToHomesteadAt5",
9+
"UnclePopulation_FrontierToHomesteadAt5",
10+
"blockChainFrontierWithLargerTDvsHomesteadBlockchain_FrontierToHomesteadAt5"
1411
]
1512
},
1613
{
1714
"reference": "Issue https://github.com/openethereum/openethereum/issues/11616",
18-
"failing": "bcFrontierToDao",
15+
"failing": "bcHomesteadToDao",
1916
"subtests": [
20-
"DaoTransactions_EmptyTransactionAndForkBlocksAhead",
21-
"DaoTransactions",
22-
"DaoTransactions_UncleExtradata",
23-
"DaoTransactions_XBlockm1"
17+
"DaoTransactions_HomesteadToDaoAt5",
18+
"DaoTransactions_UncleExtradata_HomesteadToDaoAt5",
19+
"DaoTransactions_EmptyTransactionAndForkBlocksAhead_HomesteadToDaoAt5",
20+
"DaoTransactions_XBlockm1_HomesteadToDaoAt5",
21+
"HomesteadOverrideFrontier_FrontierToHomesteadAt5",
22+
"CallContractThatCreateContractBeforeAndAfterSwitchover_FrontierToHomesteadAt5",
23+
"ContractCreationFailsOnHomestead_FrontierToHomesteadAt5"
2424
]
2525
},
2626
{
2727
"reference": "Issue https://github.com/openethereum/openethereum/issues/11616",
2828
"failing": "bcHomesteadToEIP150",
2929
"subtests": [
30-
"EIP150Transition"
30+
"EIP150Transition_HomesteadToEIP150At5"
3131
]
3232
}
3333
],
@@ -37,4 +37,4 @@
3737
],
3838
"legacy_state": [
3939
]
40-
}
40+
}

‎rpc/src/v1/tests/eth.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ impl EthTester {
174174

175175
#[test]
176176
fn harness_works() {
177-
let chain: BlockChain = extract_chain!("BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
177+
let chain: BlockChain = extract_chain!("LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
178178
let _ = EthTester::from_chain(&chain);
179179
}
180180

181181
#[test]
182182
fn eth_get_balance() {
183-
let chain = extract_chain!("BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
183+
let chain = extract_chain!("LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
184184
let tester = EthTester::from_chain(&chain);
185185
// final account state
186186
let req_latest = r#"{
@@ -206,7 +206,7 @@ fn eth_get_balance() {
206206

207207
#[test]
208208
fn eth_get_proof() {
209-
let chain = extract_chain!("BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
209+
let chain = extract_chain!("LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
210210
let tester = EthTester::from_chain(&chain);
211211
// final account state
212212
let req_latest = r#"{
@@ -232,7 +232,7 @@ fn eth_get_proof() {
232232

233233
#[test]
234234
fn eth_block_number() {
235-
let chain = extract_chain!("BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");
235+
let chain = extract_chain!("LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");
236236
let tester = EthTester::from_chain(&chain);
237237
let req_number = r#"{
238238
"jsonrpc": "2.0",
@@ -247,7 +247,7 @@ fn eth_block_number() {
247247

248248
#[test]
249249
fn eth_get_block() {
250-
let chain = extract_chain!("BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");
250+
let chain = extract_chain!("LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");
251251
let tester = EthTester::from_chain(&chain);
252252
let req_block = r#"{"method":"eth_getBlockByNumber","params":["0x0",false],"id":1,"jsonrpc":"2.0"}"#;
253253

@@ -257,13 +257,13 @@ fn eth_get_block() {
257257

258258
#[test]
259259
fn eth_get_block_by_hash() {
260-
let chain = extract_chain!("BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");
260+
let chain = extract_chain!("LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");
261261
let tester = EthTester::from_chain(&chain);
262262

263263
// We're looking for block number 4 from "RPC_API_Test_Frontier"
264-
let req_block = r#"{"method":"eth_getBlockByHash","params":["0x75e65fb3bbf5f53afe26dcc72df6a95b0e8ca5f1c450145d8c3915bd0308b75b",false],"id":1,"jsonrpc":"2.0"}"#;
264+
let req_block = r#"{"method":"eth_getBlockByHash","params":["0x088987877b431b8156c79c4b1c9543a8747531e5acaebca8f5d516cb3b35b0f2",false],"id":1,"jsonrpc":"2.0"}"#;
265265

266-
let res_block = r#"{"jsonrpc":"2.0","result":{"author":"0x8888f1f195afa192cfee860698584c030f4c9db1","difficulty":"0x20000","extraData":"0x","gasLimit":"0x1dd7ea0","gasUsed":"0x5458","hash":"0x75e65fb3bbf5f53afe26dcc72df6a95b0e8ca5f1c450145d8c3915bd0308b75b","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x8888f1f195afa192cfee860698584c030f4c9db1","mixHash":"0x55553aaef7ee28e3aea539eb784e8cc26646911a19126c242ac682c3fcf22041","nonce":"0xca2904e50ca47ace","number":"0x4","parentHash":"0x58849f66c0ca60054468725cf173b72a2769807152c625aa02e71d67ab2eaed5","receiptsRoot":"0x7ed8026cf72ed0e98e6fd53ab406e51ffd34397d9da0052494ff41376fda7b5f","sealFields":["0xa055553aaef7ee28e3aea539eb784e8cc26646911a19126c242ac682c3fcf22041","0x88ca2904e50ca47ace"],"sha3Uncles":"0x0dbc9711185574f2eee337af18d08c0afe85490304c6bb16b443991b552c5e2c","size":"0x661","stateRoot":"0x68805721294e365020aca15ed56c360d9dc2cf03cbeff84c9b84b8aed023bfb5","timestamp":"0x5c477134","totalDifficulty":"0xa0000","transactions":["0xb094b9dc356dbb8b256402c6d5709288066ad6a372c90c9c516f14277545fd58"],"transactionsRoot":"0x97a593d8d7e15b57f5c6bb25bc6c325463ef99f874bc08a78656c3ab5cb23262","uncles":["0x51b0d7366382926a4f83191af19cb4aa894f6fd9bd1bda6c04de3d5af70eddba","0x9263e0be8311eb79db96171fad3fdd70317bbbdc4081ad6b04c60335db65a3bb"]},"id":1}"#;
266+
let res_block = r#"{"jsonrpc":"2.0","result":{"author":"0x8888f1f195afa192cfee860698584c030f4c9db1","difficulty":"0x200c0","extraData":"0x","gasLimit":"0x1dd7ea0","gasUsed":"0x5458","hash":"0x088987877b431b8156c79c4b1c9543a8747531e5acaebca8f5d516cb3b35b0f2","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x8888f1f195afa192cfee860698584c030f4c9db1","mixHash":"0xeb709bc3b92c8f28ffa3d4ad7558689316cfbf599ac9541d9f3e79d31b0b9af6","nonce":"0x6ab72973b649825d","number":"0x4","parentHash":"0x095303ee87197430f9bf30ecd09735a11ab78db59abf67a36d4ada73f96800b9","receiptsRoot":"0x7ed8026cf72ed0e98e6fd53ab406e51ffd34397d9da0052494ff41376fda7b5f","sealFields":["0xa0eb709bc3b92c8f28ffa3d4ad7558689316cfbf599ac9541d9f3e79d31b0b9af6","0x886ab72973b649825d"],"sha3Uncles":"0xb9cf7d3adde9f960e6c2510c1a7d35e94223db71277463ef8dc94f8afbe44403","size":"0x661","stateRoot":"0x68805721294e365020aca15ed56c360d9dc2cf03cbeff84c9b84b8aed023bfb5","timestamp":"0x5db6f5a1","totalDifficulty":"0xa0180","transactions":["0xb094b9dc356dbb8b256402c6d5709288066ad6a372c90c9c516f14277545fd58"],"transactionsRoot":"0x97a593d8d7e15b57f5c6bb25bc6c325463ef99f874bc08a78656c3ab5cb23262","uncles":["0xffa20f3c2eafd8a4def16b2742e576280282c1476a8307ac6ff5a8a1eac99cdf","0x67faba5ff44f91127c12823a820ab5456252afa3397d08b2781fe308fb1c8359"]},"id":1}"#;
267267
assert_eq!(tester.handler.handle_request_sync(req_block).unwrap(), res_block);
268268
}
269269

@@ -509,6 +509,6 @@ fn starting_nonce_test() {
509509
assert_eq!(r#"{"jsonrpc":"2.0","result":"0x100","id":15}"#, &sample);
510510
}
511511

512-
register_test!(eth_transaction_count_1, verify_transaction_counts, "BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
513-
register_test!(eth_transaction_count_2, verify_transaction_counts, "BlockchainTests/ValidBlocks/bcTotalDifficultyTest/sideChainWithMoreTransactions");
514-
register_test!(eth_transaction_count_3, verify_transaction_counts, "BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");
512+
register_test!(eth_transaction_count_1, verify_transaction_counts, "LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcWalletTest/wallet2outOf3txs");
513+
register_test!(eth_transaction_count_2, verify_transaction_counts, "LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcTotalDifficultyTest/sideChainWithMoreTransactions");
514+
register_test!(eth_transaction_count_3, verify_transaction_counts, "LegacyTests/Constantinople/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test");

0 commit comments

Comments
 (0)