From 1aa34e9dd46a53ec024cf84d253a4c9da78ffe8e Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 24 Mar 2016 01:25:59 +0100 Subject: [PATCH] fixed loading of executive tests, unrevealed failing consensus tests --- ethcore/src/action_params.rs | 17 +++++ ethcore/src/env_info.rs | 16 +++++ ethcore/src/json_tests/chain.rs | 4 +- ethcore/src/json_tests/executive.rs | 103 +++++++++------------------- ethcore/src/pod_account.rs | 2 +- ethcore/src/state_diff.rs | 10 ++- json/src/blockchain/state.rs | 10 +-- json/src/blockchain/test.rs | 10 +-- json/src/hash.rs | 2 +- json/src/lib.rs.in | 1 + json/src/maybe.rs | 83 ++++++++++++++++++++++ json/src/vm/call.rs | 3 +- json/src/vm/env.rs | 2 +- json/src/vm/mod.rs | 2 + json/src/vm/test.rs | 43 ++++++++++++ json/src/vm/vm.rs | 25 +++++-- 16 files changed, 240 insertions(+), 93 deletions(-) create mode 100644 json/src/maybe.rs create mode 100644 json/src/vm/test.rs diff --git a/ethcore/src/action_params.rs b/ethcore/src/action_params.rs index fa40d30a0..2f5aa3340 100644 --- a/ethcore/src/action_params.rs +++ b/ethcore/src/action_params.rs @@ -16,6 +16,7 @@ //! Evm input params. use common::*; +use ethjson; /// Transaction value #[derive(Clone, Debug)] @@ -67,3 +68,19 @@ impl Default for ActionParams { } } } + +impl From for ActionParams { + fn from(t: ethjson::vm::Transaction) -> Self { + ActionParams { + code_address: Address::new(), + address: t.address.into(), + sender: t.sender.into(), + origin: t.origin.into(), + code: Some(t.code.into()), + data: Some(t.data.into()), + gas: t.gas.into(), + gas_price: t.gas_price.into(), + value: ActionValue::Transfer(t.value.into()), + } + } +} diff --git a/ethcore/src/env_info.rs b/ethcore/src/env_info.rs index 02fc5188c..1a4e71c67 100644 --- a/ethcore/src/env_info.rs +++ b/ethcore/src/env_info.rs @@ -16,6 +16,7 @@ use util::*; use header::BlockNumber; +use ethjson; /// Simple vector of hashes, should be at most 256 items large, can be smaller if being used /// for a block whose number is less than 257. @@ -69,6 +70,21 @@ impl FromJson for EnvInfo { } } +impl From for EnvInfo { + fn from(e: ethjson::vm::Env) -> Self { + let number = e.number.into(); + EnvInfo { + number: number, + author: e.author.into(), + difficulty: e.difficulty.into(), + gas_limit: e.gas_limit.into(), + timestamp: e.timestamp.into(), + last_hashes: (1..cmp::min(number + 1, 257)).map(|i| format!("{}", number - i).as_bytes().sha3()).collect(), + gas_used: U256::zero(), + } + } +} + #[cfg(test)] mod tests { extern crate rustc_serialize; diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs index a2e6a5659..a1154f6a9 100644 --- a/ethcore/src/json_tests/chain.rs +++ b/ethcore/src/json_tests/chain.rs @@ -28,7 +28,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec { let tests = ethjson::blockchain::Test::load(json_data).unwrap(); let mut failed = Vec::new(); - for (name, blockchain) in tests.deref() { + for (name, blockchain) in tests.into_iter() { let mut fail = false; { let mut fail_unless = |cond: bool| if !cond && !fail { @@ -61,7 +61,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec { client.import_verified_blocks(&IoChannel::disconnected()); } } - fail_unless(client.chain_info().best_block_hash == blockchain.best_block.clone().into()); + fail_unless(client.chain_info().best_block_hash == blockchain.best_block.into()); } } diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs index dbb9bb6ab..52f4d7981 100644 --- a/ethcore/src/json_tests/executive.rs +++ b/ethcore/src/json_tests/executive.rs @@ -25,6 +25,8 @@ use ethereum; use externalities::*; use substate::*; use tests::helpers::*; +use state_diff::StateDiff; +use ethjson; struct TestEngineFrontier { vm_factory: Factory, @@ -53,6 +55,7 @@ impl Engine for TestEngineFrontier { } } +#[derive(Debug, PartialEq)] struct CallCreate { data: Bytes, destination: Option
, @@ -60,6 +63,18 @@ struct CallCreate { value: U256 } +impl From for CallCreate { + fn from(c: ethjson::vm::Call) -> Self { + let dst: Option<_> = c.destination.into(); + CallCreate { + data: c.data.into(), + destination: dst.map(Into::into), + gas_limit: c.gas_limit.into(), + value: c.value.into() + } + } +} + /// Tiny wrapper around executive externalities. /// Stores callcreates. struct TestExt<'a> { @@ -174,58 +189,26 @@ fn do_json_test(json_data: &[u8]) -> Vec { .collect() } -fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec { - let json = Json::from_str(::std::str::from_utf8(json_data).unwrap()).expect("Json is invalid"); +fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec { + let tests = ethjson::vm::Test::load(json_data).unwrap(); let mut failed = Vec::new(); - for (name, test) in json.as_object().unwrap() { + + for (name, vm) in tests.into_iter() { println!("name: {:?}", name); - // sync io is usefull when something crashes in jit - // ::std::io::stdout().write(&name.as_bytes()); - // ::std::io::stdout().write(b"\n"); - // ::std::io::stdout().flush(); let mut fail = false; - //let mut fail_unless = |cond: bool| if !cond && !fail { failed.push(name.to_string()); fail = true }; + let mut fail_unless = |cond: bool, s: &str | if !cond && !fail { - failed.push(format!("[{}] {}: {}", vm, name, s)); + failed.push(format!("[{}] {}: {}", vm_type, name, s)); fail = true }; - // test env + let out_of_gas = vm.out_of_gas(); let mut state_result = get_temp_state(); let mut state = state_result.reference_mut(); - - test.find("pre").map(|pre| for (addr, s) in pre.as_object().unwrap() { - let address = Address::from(addr.as_ref()); - let balance = xjson!(&s["balance"]); - let code = xjson!(&s["code"]); - let _nonce: U256 = xjson!(&s["nonce"]); - - state.new_contract(&address, balance); - state.init_code(&address, code); - BTreeMap::from_json(&s["storage"]).into_iter().foreach(|(k, v)| state.set_storage(&address, k, v)); - }); - - let info = test.find("env").map(|env| { - EnvInfo::from_json(env) - }).unwrap_or_default(); - - let engine = TestEngineFrontier::new(1, vm.clone()); - - // params - let mut params = ActionParams::default(); - test.find("exec").map(|exec| { - params.address = xjson!(&exec["address"]); - params.sender = xjson!(&exec["caller"]); - params.origin = xjson!(&exec["origin"]); - params.code = xjson!(&exec["code"]); - params.data = xjson!(&exec["data"]); - params.gas = xjson!(&exec["gas"]); - params.gas_price = xjson!(&exec["gasPrice"]); - params.value = ActionValue::Transfer(xjson!(&exec["value"])); - }); - - let out_of_gas = test.find("callcreates").map(|_calls| { - }).is_none(); + state.populate_from(From::from(vm.pre_state.clone())); + let info = From::from(vm.env); + let engine = TestEngineFrontier::new(1, vm_type.clone()); + let params = ActionParams::from(vm.transaction); let mut substate = Substate::new(false); let mut output = vec![]; @@ -247,44 +230,26 @@ fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec { (res, ex.callcreates) }; - // then validate match res { Err(_) => fail_unless(out_of_gas, "didn't expect to run out of gas."), Ok(gas_left) => { - // println!("name: {}, gas_left : {:?}", name, gas_left); fail_unless(!out_of_gas, "expected to run out of gas."); - fail_unless(gas_left == xjson!(&test["gas"]), "gas_left is incorrect"); - fail_unless(output == Bytes::from_json(&test["out"]), "output is incorrect"); + fail_unless(Some(gas_left) == vm.gas_left.map(Into::into), "gas_left is incorrect"); + let vm_output: Option> = vm.output.map(Into::into); + fail_unless(Some(output) == vm_output, "output is incorrect"); - test.find("post").map(|pre| for (addr, s) in pre.as_object().unwrap() { - let address = Address::from(addr.as_ref()); - - fail_unless(state.code(&address).unwrap_or_else(|| vec![]) == Bytes::from_json(&s["code"]), "code is incorrect"); - fail_unless(state.balance(&address) == xjson!(&s["balance"]), "balance is incorrect"); - fail_unless(state.nonce(&address) == xjson!(&s["nonce"]), "nonce is incorrect"); - BTreeMap::from_json(&s["storage"]).iter().foreach(|(k, v)| fail_unless(&state.storage_at(&address, &k) == v, "storage is incorrect")); - }); - - let cc = test["callcreates"].as_array().unwrap(); - fail_unless(callcreates.len() == cc.len(), "callcreates does not match"); - for i in 0..cc.len() { - let callcreate = &callcreates[i]; - let expected = &cc[i]; - fail_unless(callcreate.data == Bytes::from_json(&expected["data"]), "callcreates data is incorrect"); - fail_unless(callcreate.destination == xjson!(&expected["destination"]), "callcreates destination is incorrect"); - fail_unless(callcreate.value == xjson!(&expected["value"]), "callcreates value is incorrect"); - fail_unless(callcreate.gas_limit == xjson!(&expected["gasLimit"]), "callcreates gas_limit is incorrect"); - } + let diff = StateDiff::diff_pod(&state.to_pod(), &From::from(vm.post_state.unwrap())); + fail_unless(diff.is_empty(), format!("diff should be empty!: {:?}", diff).as_ref()); + let calls: Option> = vm.calls.map(|c| c.into_iter().map(From::from).collect()); + fail_unless(Some(callcreates) == calls, "callcreates does not match"); } - } + }; } - for f in &failed { println!("FAILED: {:?}", f); } - //assert!(false); failed } diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs index 387679da9..623211ae6 100644 --- a/ethcore/src/pod_account.rs +++ b/ethcore/src/pod_account.rs @@ -19,7 +19,7 @@ use account::*; use account_db::*; use ethjson; -#[derive(Debug,Clone,PartialEq,Eq)] +#[derive(Debug, Clone, PartialEq, Eq)] /// An account, expressed as Plain-Old-Data (hence the name). /// Does not have a DB overlay cache, code hash or anything like that. pub struct PodAccount { diff --git a/ethcore/src/state_diff.rs b/ethcore/src/state_diff.rs index 2f3a0c8c8..6c41d167c 100644 --- a/ethcore/src/state_diff.rs +++ b/ethcore/src/state_diff.rs @@ -20,7 +20,7 @@ use pod_state::*; use account_diff::*; #[derive(Debug,Clone,PartialEq,Eq)] -/// Expression for the delta between two system states. Encoded the +/// Expression for the delta between two system states. Encoded the /// delta of every altered account. pub struct StateDiff (BTreeMap); @@ -41,6 +41,14 @@ impl fmt::Display for StateDiff { } } +impl Deref for StateDiff { + type Target = BTreeMap; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + #[cfg(test)] mod test { use common::*; diff --git a/json/src/blockchain/state.rs b/json/src/blockchain/state.rs index 51e77e95e..7779bd861 100644 --- a/json/src/blockchain/state.rs +++ b/json/src/blockchain/state.rs @@ -17,7 +17,6 @@ //! Blockchain test state deserializer. use std::collections::BTreeMap; -use std::ops::Deref; use hash::Address; use blockchain::account::Account; @@ -25,10 +24,11 @@ use blockchain::account::Account; #[derive(Debug, PartialEq, Deserialize, Clone)] pub struct State(pub BTreeMap); -impl Deref for State { - type Target = BTreeMap; +impl IntoIterator for State { + type Item = as IntoIterator>::Item; + type IntoIter = as IntoIterator>::IntoIter; - fn deref(&self) -> &Self::Target { - &self.0 + fn into_iter(self) -> Self::IntoIter { + self.0.into_iter() } } diff --git a/json/src/blockchain/test.rs b/json/src/blockchain/test.rs index 1a6a63a71..301d921df 100644 --- a/json/src/blockchain/test.rs +++ b/json/src/blockchain/test.rs @@ -17,7 +17,6 @@ //! Blockchain test deserializer. use std::collections::BTreeMap; -use std::ops::Deref; use std::io::Read; use serde_json; use serde_json::Error; @@ -27,11 +26,12 @@ use blockchain::blockchain::BlockChain; #[derive(Debug, PartialEq, Deserialize)] pub struct Test(BTreeMap); -impl Deref for Test { - type Target = BTreeMap; +impl IntoIterator for Test { + type Item = as IntoIterator>::Item; + type IntoIter = as IntoIterator>::IntoIter; - fn deref(&self) -> &Self::Target { - &self.0 + fn into_iter(self) -> Self::IntoIter { + self.0.into_iter() } } diff --git a/json/src/hash.rs b/json/src/hash.rs index c555b6266..ad546fcab 100644 --- a/json/src/hash.rs +++ b/json/src/hash.rs @@ -26,7 +26,7 @@ macro_rules! impl_hash { ($name: ident, $inner: ident) => { /// Lenient hash json deserialization for test json files. #[derive(Default, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone)] - pub struct $name($inner); + pub struct $name(pub $inner); impl Into<$inner> for $name { fn into(self) -> $inner { diff --git a/json/src/lib.rs.in b/json/src/lib.rs.in index 20e7e35da..aff685cb7 100644 --- a/json/src/lib.rs.in +++ b/json/src/lib.rs.in @@ -25,3 +25,4 @@ pub mod bytes; pub mod blockchain; pub mod spec; pub mod vm; +pub mod maybe; diff --git a/json/src/maybe.rs b/json/src/maybe.rs new file mode 100644 index 000000000..dd4d5d821 --- /dev/null +++ b/json/src/maybe.rs @@ -0,0 +1,83 @@ + +//! Deserializer of empty string values into optionals. + +use std::marker::PhantomData; +use serde::{Deserialize, Deserializer, Error}; +use serde::de::Visitor; +use serde_json::Value; +use serde_json::value; + +/// Deserializer of empty string values into optionals. +#[derive(Debug, PartialEq)] +pub enum MaybeEmpty { + /// Some. + Some(T), + /// None. + None, +} + +impl Deserialize for MaybeEmpty where T: Deserialize { + fn deserialize(deserializer: &mut D) -> Result + where D: Deserializer { + deserializer.deserialize(MaybeEmptyVisitor::new()) + } +} + +struct MaybeEmptyVisitor { + _phantom: PhantomData +} + +impl MaybeEmptyVisitor { + fn new() -> Self { + MaybeEmptyVisitor { + _phantom: PhantomData + } + } +} + +impl Visitor for MaybeEmptyVisitor where T: Deserialize { + type Value = MaybeEmpty; + + fn visit_str(&mut self, value: &str) -> Result where E: Error { + self.visit_string(value.to_owned()) + } + + fn visit_string(&mut self, value: String) -> Result where E: Error { + match value.is_empty() { + true => Ok(MaybeEmpty::None), + false => { + let value = Value::String(value); + T::deserialize(&mut value::Deserializer::new(value)).map(MaybeEmpty::Some).map_err(|_| Error::custom("failed")) + } + } + } +} + +impl Into> for MaybeEmpty { + fn into(self) -> Option { + match self { + MaybeEmpty::Some(s) => Some(s), + MaybeEmpty::None => None + } + } +} + +#[cfg(test)] +mod tests { + use std::str::FromStr; + use serde_json; + use util::hash; + use hash::H256; + use maybe::MaybeEmpty; + + #[test] + fn maybe_deserialization() { + let s = r#"["", "5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae"]"#; + let deserialized: Vec> = serde_json::from_str(s).unwrap(); + assert_eq!(deserialized, vec![ + MaybeEmpty::None, + MaybeEmpty::Some(H256(hash::H256::from_str("5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae").unwrap())) + ]); + } + +} diff --git a/json/src/vm/call.rs b/json/src/vm/call.rs index ca955c7bd..2fe6265aa 100644 --- a/json/src/vm/call.rs +++ b/json/src/vm/call.rs @@ -19,6 +19,7 @@ use bytes::Bytes; use hash::Address; use uint::Uint; +use maybe::MaybeEmpty; /// Vm call deserialization. #[derive(Debug, PartialEq, Deserialize)] @@ -26,7 +27,7 @@ pub struct Call { /// Call data. pub data: Bytes, /// Call destination. - pub destination: Address, + pub destination: MaybeEmpty
, /// Gas limit. #[serde(rename="gasLimit")] pub gas_limit: Uint, diff --git a/json/src/vm/env.rs b/json/src/vm/env.rs index 547298988..95365c0a8 100644 --- a/json/src/vm/env.rs +++ b/json/src/vm/env.rs @@ -23,7 +23,7 @@ use uint::Uint; pub struct Env { /// Address. #[serde(rename="currentCoinbase")] - pub coinbase: Address, + pub author: Address, /// Difficulty #[serde(rename="currentDifficulty")] pub difficulty: Uint, diff --git a/json/src/vm/mod.rs b/json/src/vm/mod.rs index cc4a9662e..ecc0d05a4 100644 --- a/json/src/vm/mod.rs +++ b/json/src/vm/mod.rs @@ -21,9 +21,11 @@ pub mod transaction; pub mod vm; pub mod log; pub mod call; +pub mod test; pub use self::env::Env; pub use self::transaction::Transaction; pub use self::vm::Vm; pub use self::log::Log; pub use self::call::Call; +pub use self::test::Test; diff --git a/json/src/vm/test.rs b/json/src/vm/test.rs new file mode 100644 index 000000000..e348826e1 --- /dev/null +++ b/json/src/vm/test.rs @@ -0,0 +1,43 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Vm test deserializer. + +use std::collections::BTreeMap; +use std::io::Read; +use serde_json; +use serde_json::Error; +use vm::Vm; + +/// Vm test deserializer. +#[derive(Debug, PartialEq, Deserialize)] +pub struct Test(BTreeMap); + +impl IntoIterator for Test { + type Item = as IntoIterator>::Item; + type IntoIter = as IntoIterator>::IntoIter; + + fn into_iter(self) -> Self::IntoIter { + self.0.into_iter() + } +} + +impl Test { + /// Loads test from json. + pub fn load(reader: R) -> Result where R: Read { + serde_json::from_reader(reader) + } +} diff --git a/json/src/vm/vm.rs b/json/src/vm/vm.rs index 8e7a44986..b0a7c2a4b 100644 --- a/json/src/vm/vm.rs +++ b/json/src/vm/vm.rs @@ -19,7 +19,7 @@ use bytes::Bytes; use uint::Uint; use blockchain::State; -use vm::{Transaction, Log, Call}; +use vm::{Transaction, Log, Call, Env}; /// Reporesents vm execution environment before and after exeuction of transaction. #[derive(Debug, PartialEq, Deserialize)] @@ -27,23 +27,34 @@ pub struct Vm { /// Contract calls made internaly by executed transaction. #[serde(rename="callcreates")] pub calls: Option>, + /// Env info. + pub env: Env, /// Executed transaction #[serde(rename="exec")] - pub exec: Transaction, - /// Gas. - pub gas: Uint, + pub transaction: Transaction, + /// Gas left after transaction execution. + #[serde(rename="gas")] + pub gas_left: Option, /// Logs created during execution of transaction. - pub logs: Vec, + pub logs: Option>, /// Transaction output. - pub out: Bytes, + #[serde(rename="out")] + pub output: Option, /// Post execution vm state. #[serde(rename="post")] - pub post_state: State, + pub post_state: Option, /// Pre execution vm state. #[serde(rename="pre")] pub pre_state: State, } +impl Vm { + /// Returns true if transaction execution run out of gas. + pub fn out_of_gas(&self) -> bool { + self.calls.is_none() + } +} + #[cfg(test)] mod tests { use serde_json;