grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gavofyork/ethcore into executive_tests

Browse Source
This commit is contained in:
debris
2016-01-13 21:53:38 +01:00
parent cb16bdb350 b87e0fce64
commit 922dae31d5
4 changed files with 281 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tests/state.rs
View File

@@ -47,7 +47,7 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
let t = Transaction::from_json(&test["transaction"]);
let env = EnvInfo::from_json(&test["env"]);
let out = bytes_from_json(&test["out"]);
let _out = bytes_from_json(&test["out"]);
let post_state_root = h256_from_json(&test["postStateRoot"]);
let pre = pod_map_from_json(&test["pre"]);
let post = pod_map_from_json(&test["post"]);
@@ -55,18 +55,15 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
println!("Transaction: {:?}", t);
println!("Env: {:?}", env);
println!("Out: {:?}", out);
println!("Pre: {:?}", pre);
println!("Post: {:?}", post);
let mut s = State::new_temp();
s.populate_from(pre);
s.apply(&env, engine.deref(), &t).unwrap();
let our_post = s.to_pod_map();
if fail_unless(s.root() == &post_state_root) {
println!("EXPECTED:\n{:?}", post);
println!("GOT:\n{:?}", our_post);
println!("DIFF:\n{:?}", pod_map_diff(&post, &our_post));
}
// TODO: Compare logs.