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

Fixing json tests

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-06-24 10:57:44 +02:00
parent 34c89e5841
commit dc7c53d59a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ethcore/src/json_tests/chain.rs
View File

@ -22,6 +22,7 @@ use tests::helpers::*;
use devtools::*; use devtools::*;
use spec::Genesis; use spec::Genesis;
use ethjson; use ethjson;
use ethjson::blockchain::BlockChain;
use miner::Miner; use miner::Miner;
pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> { pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
@ -41,7 +42,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
flush!(" - {}...", name); flush!(" - {}...", name);
let spec = || { let spec = |blockchain: &BlockChain| {
let genesis = Genesis::from(blockchain.genesis()); let genesis = Genesis::from(blockchain.genesis());
let state = From::from(blockchain.pre_state.clone()); let state = From::from(blockchain.pre_state.clone());
let mut spec = match era { let mut spec = match era {
@ -58,9 +59,9 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
{ {
let client = Client::new( let client = Client::new(
ClientConfig::default(), ClientConfig::default(),
spec(), spec(&blockchain),
temp.as_path(), temp.as_path(),
Arc::new(Miner::with_spec(spec())), Arc::new(Miner::with_spec(spec(&blockchain))),
IoChannel::disconnected() IoChannel::disconnected()
).unwrap(); ).unwrap();
for b in &blockchain.blocks_rlp() { for b in &blockchain.blocks_rlp() {