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

Merge remote-tracking branch 'origin/main' into dev

Browse Source
This commit is contained in:
rakita
2021-03-10 17:23:00 +01:00
parent d7a958129f 187c81b3f1
commit 32fd2b484c
24 changed files with 155 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ethcore/src/json_tests/runner.rs
View File

@@ -184,7 +184,7 @@ impl TestRunner {
return Vec::new();
}
}
super::state::json_chain_test(&test, &path, &json, &mut |_, _| {})
super::state::json_state_test(&test, &path, &json, &mut |_, _| {})
},
)
}

6
crates/ethcore/src/json_tests/state.rs
View File

@@ -20,7 +20,6 @@ use ethjson;
use pod_state::PodState;
use std::path::Path;
use trace;
use types::transaction::SignedTransaction;
use vm::EnvInfo;
fn skip_test(
@@ -42,7 +41,7 @@ fn skip_test(
})
}
pub fn json_chain_test<H: FnMut(&str, HookType)>(
pub fn json_state_test<H: FnMut(&str, HookType)>(
state_test: &ethjson::test::StateTests,
path: &Path,
json_data: &[u8],
@@ -91,8 +90,7 @@ pub fn json_chain_test<H: FnMut(&str, HookType)>(
}
let post_root: H256 = state.hash.into();
let transaction: SignedTransaction =
multitransaction.select(&state.indexes).into();
let transaction = multitransaction.select(&state.indexes);
let result = || -> Result<_, EvmTestError> {
Ok(EvmTestClient::from_pod_state(&spec, pre.clone())?.transact(