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

Merge branch 'master' into jsonrpc2

Browse Source
This commit is contained in:
debris
2016-02-19 12:52:16 +01:00
parent ed880b3b58 57ef5e2691
commit ef8055f900
30 changed files with 424 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sync/src/tests/helpers.rs
View File

@@ -217,7 +217,10 @@ impl BlockChainClient for TestBlockChainClient {
}
let len = self.numbers.read().unwrap().len();
if number == len {
*self.difficulty.write().unwrap().deref_mut() += header.difficulty;
{
let mut difficulty = self.difficulty.write().unwrap();
*difficulty.deref_mut() = *difficulty.deref() + header.difficulty;
}
mem::replace(self.last_hash.write().unwrap().deref_mut(), h.clone());
self.blocks.write().unwrap().insert(h.clone(), b);
self.numbers.write().unwrap().insert(number, h.clone());