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

Changing state tests to support transition

Browse Source
This commit is contained in:
Tomusdrw
2016-01-16 21:08:04 +01:00
parent 9849ce08e0
commit 56c059588d
3 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ethereum/mod.rs
View File

@@ -23,6 +23,9 @@ pub fn new_frontier_test() -> Spec { Spec::from_json_utf8(include_bytes!("../../
/// Create a new Homestead chain spec as though it never changed from Frontier.
pub fn new_homestead_test() -> Spec { Spec::from_json_utf8(include_bytes!("../../res/ethereum/homestead_test.json")) }
/// Create a new Frontier main net chain spec without genesis accounts.
pub fn new_frontier_like_test() -> Spec { Spec::from_json_utf8(include_bytes!("../../res/ethereum/frontier_like_test.json")) }
/// Create a new Morden chain spec.
pub fn new_morden() -> Spec { Spec::from_json_utf8(include_bytes!("../../res/ethereum/morden.json")) }

17
src/tests/state.rs
View File

@@ -4,26 +4,14 @@ use pod_state::*;
use state_diff::*;
use ethereum;
const HOMESTEAD_BLOCK : u64 = 0x0dbba0;
fn do_json_test(json_data: &[u8]) -> Vec<String> {
let json = Json::from_str(::std::str::from_utf8(json_data).unwrap()).expect("Json is invalid");
let mut failed = Vec::new();
let engine = |block_number: u64| {
if block_number >= HOMESTEAD_BLOCK {
ethereum::new_homestead_test().to_engine().unwrap()
} else {
ethereum::new_frontier_test().to_engine().unwrap()
}
};
let engine = ethereum::new_frontier_like_test().to_engine().unwrap();
flush(format!("\n"));
for (name, test) in json.as_object().unwrap() {
if name != "createNameRegistratorPerTxsAt" {
continue;
}
let mut fail = false;
{
let mut fail_unless = |cond: bool| if !cond && !fail {
@@ -35,9 +23,8 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
flush(format!(" - {}...", name));
let env = EnvInfo::from_json(&test["env"]);
let engine = engine(env.number);
let t = Transaction::from_json(&test["transaction"]);
let env = EnvInfo::from_json(&test["env"]);
let _out = Bytes::from_json(&test["out"]);
let post_state_root = xjson!(&test["postStateRoot"]);
let pre = PodState::from_json(&test["pre"]);