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

Commit 5eb62be

Browse files
author
adria0
committed
json test suite
1 parent 698e696 commit 5eb62be

File tree

18 files changed

+593
-632
lines changed

18 files changed

+593
-632
lines changed

Cargo.lock

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ethcore/Cargo.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ ethereum-types = "0.9.0"
2727
evm = { path = "evm" }
2828
executive-state = { path = "executive-state" }
2929
futures = "0.1"
30+
globset = "0.4.5"
3031
hash-db = "0.15.0"
3132
itertools = "0.8.2"
3233
journaldb = { path = "../util/journaldb" }
@@ -53,6 +54,7 @@ rustc-hex = "2.1.0"
5354
scopeguard = "1.1.0"
5455
serde = "1.0"
5556
serde_derive = "1.0"
57+
serde_json = "1.0"
5658
snapshot = { path = "snapshot" }
5759
spec = { path = "spec" }
5860
state-db = { path = "state-db" }
@@ -65,6 +67,7 @@ unexpected = { path = "../util/unexpected" }
6567
using_queue = { path = "../miner/using-queue" }
6668
verification = { path = "./verification" }
6769
vm = { path = "vm" }
70+
walkdir = { version = "2.3.1", optional = true }
6871

6972
[dev-dependencies]
7073
account-db = { path = "account-db" }
@@ -82,10 +85,8 @@ kvdb-rocksdb = "0.7.0"
8285
lazy_static = "1.3"
8386
machine = { path = "./machine", features = ["test-helpers"] }
8487
parity-runtime = "0.1.1"
85-
serde_json = "1.0"
8688
stats = { path = "../util/stats" }
8789
pod = { path = "pod" }
88-
tempfile = "3.1"
8990
trie-standardmap = "0.15.0"
9091

9192
[features]
@@ -114,7 +115,7 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
114115
# EVM debug traces are printed.
115116
slow-blocks = []
116117
# Run JSON consensus tests.
117-
json-tests = ["env_logger", "test-helpers", "lazy_static", "machine/test-helpers", "common-types/test-helpers"]
118+
json-tests = ["env_logger", "test-helpers", "walkdir", "machine/test-helpers", "common-types/test-helpers"]
118119
# Run memory/cpu heavy tests.
119120
test-heavy = []
120121
# Compile test helpers

ethcore/res/ethereum/runner/full.json

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
{
2+
"chain": [
3+
{
4+
"path": "res/ethereum/tests/BlockchainTests",
5+
"skip": [
6+
{
7+
"reference": "Issue https://github.com/openethereum/openethereum/issues/11616",
8+
"names": [
9+
"blockChainFrontierWithLargerTDvsHomesteadBlockchain2_FrontierToHomesteadAt5",
10+
"UncleFromFrontierInHomestead_FrontierToHomesteadAt5",
11+
"UnclePopulation_FrontierToHomesteadAt5",
12+
"blockChainFrontierWithLargerTDvsHomesteadBlockchain_FrontierToHomesteadAt5",
13+
"DaoTransactions_HomesteadToDaoAt5",
14+
"DaoTransactions_UncleExtradata_HomesteadToDaoAt5",
15+
"DaoTransactions_EmptyTransactionAndForkBlocksAhead_HomesteadToDaoAt5",
16+
"DaoTransactions_XBlockm1_HomesteadToDaoAt5",
17+
"HomesteadOverrideFrontier_FrontierToHomesteadAt5",
18+
"CallContractThatCreateContractBeforeAndAfterSwitchover_FrontierToHomesteadAt5",
19+
"ContractCreationFailsOnHomestead_FrontierToHomesteadAt5",
20+
"EIP150Transition_HomesteadToEIP150At5"
21+
],
22+
"paths": []
23+
},
24+
{
25+
"reference": "Tests that takes a lot of time to execute, ignored by geth",
26+
"names": [],
27+
"paths": [
28+
"res/ethereum/tests/BlockchainTests/stTimeConsuming/*"
29+
]
30+
}
31+
]
32+
},
33+
{
34+
"path": "res/ethereum/tests/LegacyTests/Constantinople/BlockchainTests",
35+
"skip": [
36+
{
37+
"reference": "Issue https://github.com/openethereum/openethereum/issues/11616",
38+
"names": [
39+
"blockChainFrontierWithLargerTDvsHomesteadBlockchain2_FrontierToHomesteadAt5",
40+
"UncleFromFrontierInHomestead_FrontierToHomesteadAt5",
41+
"UnclePopulation_FrontierToHomesteadAt5",
42+
"blockChainFrontierWithLargerTDvsHomesteadBlockchain_FrontierToHomesteadAt5",
43+
"DaoTransactions_HomesteadToDaoAt5",
44+
"DaoTransactions_UncleExtradata_HomesteadToDaoAt5",
45+
"DaoTransactions_EmptyTransactionAndForkBlocksAhead_HomesteadToDaoAt5",
46+
"DaoTransactions_XBlockm1_HomesteadToDaoAt5",
47+
"HomesteadOverrideFrontier_FrontierToHomesteadAt5",
48+
"CallContractThatCreateContractBeforeAndAfterSwitchover_FrontierToHomesteadAt5",
49+
"ContractCreationFailsOnHomestead_FrontierToHomesteadAt5",
50+
"EIP150Transition_HomesteadToEIP150At5"
51+
],
52+
"paths": []
53+
},
54+
{
55+
"reference": "Tests that takes a lot of time to execute, ignored by geth",
56+
"names": [],
57+
"paths": [
58+
"res/ethereum/tests/LegacyTests/Constantinople/BlockchainTests/stTimeConsuming/*"
59+
]
60+
}
61+
]
62+
}
63+
],
64+
"state": [
65+
{
66+
"path": "res/ethereum/tests/GeneralStateTests",
67+
"skip": [
68+
{
69+
"reference": "Tests that takes a lot of time to execute, ignored by geth",
70+
"names": {},
71+
"paths": [
72+
"res/ethereum/tests/GeneralStateTests/stTimeConsuming/*",
73+
"res/ethereum/tests/GeneralStateTests/stStaticCall/static_Call1MB1024Calldepth.json"
74+
]
75+
}
76+
]
77+
},
78+
{
79+
"path": "res/ethereum/tests/LegacyTests/Constantinople/GeneralStateTests",
80+
"skip": [
81+
{
82+
"reference": "Tests that takes a lot of time to execute, ignored by geth",
83+
"names": {},
84+
"paths": [
85+
"res/ethereum/tests/LegacyTests/GeneralStateTests/Constantinople/stTimeConsuming/*",
86+
"res/ethereum/tests/LegacyTests/GeneralStateTests/Constantinople/stStaticCall/static_Call1MB1024Calldepth.json"
87+
]
88+
}
89+
]
90+
}
91+
],
92+
"difficulty": [
93+
{
94+
"path": [
95+
"res/ethereum/tests/BasicTests/difficulty.json",
96+
"res/ethereum/tests/BasicTests/difficultyMainNetwork.json"
97+
],
98+
"chainspec": "Foundation"
99+
}
100+
],
101+
"executive": [
102+
{
103+
"path": "res/ethereum/tests/VMTests"
104+
}
105+
],
106+
"transaction": [
107+
{
108+
"path": "res/ethereum/tests/TransactionTests"
109+
}
110+
],
111+
"trie": [
112+
{
113+
"path": [
114+
"res/ethereum/tests/TrieTests/trietest.json",
115+
"res/ethereum/tests/TrieTests/trieanyorder.json"
116+
],
117+
"triespec": "Generic"
118+
},
119+
{
120+
"path": [
121+
"res/ethereum/tests/TrieTests/hex_encoded_securetrie_test.json",
122+
"res/ethereum/tests/TrieTests/trietest_secureTrie.json",
123+
"res/ethereum/tests/TrieTests/trieanyorder_secureTrie.json"
124+
],
125+
"triespec": "Secure"
126+
}
127+
]
128+
}

ethcore/res/ethereum/tests

Submodule tests updated 13763 files

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

-40
This file was deleted.

0 commit comments

Comments
 (0)