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

Merge branch 'master' into client-refact

Browse Source
This commit is contained in:
Nikolay Volf
2016-06-01 12:45:04 +02:00
parent db749dc564 e743972102
commit 0c782bf34b
29 changed files with 814 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sync/src/chain.rs
View File

@@ -1294,8 +1294,8 @@ mod tests {
fn get_dummy_block(order: u32, parent_hash: H256) -> Bytes {
let mut header = Header::new();
header.gas_limit = x!(0);
header.difficulty = x!(order * 100);
header.gas_limit = 0.into();
header.difficulty = (order * 100).into();
header.timestamp = (order * 10) as u64;
header.number = order as u64;
header.parent_hash = parent_hash;
@@ -1311,7 +1311,7 @@ mod tests {
fn get_dummy_blocks(order: u32, parent_hash: H256) -> Bytes {
let mut rlp = RlpStream::new_list(1);
rlp.append_raw(&get_dummy_block(order, parent_hash), 1);
let difficulty: U256 = x!(100 * order);
let difficulty: U256 = (100 * order).into();
rlp.append(&difficulty);
rlp.out()
}