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

Merge branch 'master' into pv63-receipts

Browse Source 
Conflicts:
	ethcore/src/client/client.rs
This commit is contained in:
Nikolay Volf
2016-03-14 17:36:51 +01:00
parent 8f4323f3bb 683c13db37
commit 8cdb013f9f
25 changed files with 109 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/src/tests/client.rs
View File

@@ -144,7 +144,7 @@ fn can_mine() {
let client_result = get_test_client_with_blocks(vec![dummy_blocks[0].clone()]);
let client = client_result.reference();
let b = client.prepare_sealing(Address::default(), vec![], vec![]).unwrap();
let b = client.prepare_sealing(Address::default(), x!(31415926), vec![], vec![]).unwrap();
assert_eq!(*b.block().header().parent_hash(), BlockView::new(&dummy_blocks[0]).header_view().sha3());
assert!(client.try_seal(b, vec![]).is_ok());