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

Don't call update_sealing on importing own block (#1762)

Browse Source
This commit is contained in:
Arkadiy Paronyan 2016-07-29 09:56:55 +02:00 committed by Gav Wood
parent e4f0c0b215
commit b37086722a
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ethcore/src/client/client.rs
View File

@ -1041,8 +1041,6 @@ impl MiningBlockChainClient for Client {
let _timer = PerfTimer::new("import_sealed_block"); let _timer = PerfTimer::new("import_sealed_block");
let start = precise_time_ns(); let start = precise_time_ns();
let original_best = self.chain_info().best_block_hash;
let h = block.header().hash(); let h = block.header().hash();
let number = block.header().number(); let number = block.header().number();
@ -1050,26 +1048,19 @@ impl MiningBlockChainClient for Client {
let route = self.commit_block(block, &h, &block_data); let route = self.commit_block(block, &h, &block_data);
trace!(target: "client", "Imported sealed block #{} ({})", number, h); trace!(target: "client", "Imported sealed block #{} ({})", number, h);
{ let (enacted, retracted) = self.calculate_enacted_retracted(&[route]);
let (enacted, retracted) = self.calculate_enacted_retracted(&[route]); self.miner.chain_new_blocks(self, &[h.clone()], &[], &enacted, &retracted);
self.miner.chain_new_blocks(self, &[h.clone()], &[], &enacted, &retracted);
self.notify(|notify| {
notify.new_blocks(
vec![h.clone()],
vec![],
enacted.clone(),
retracted.clone(),
vec![h.clone()],
precise_time_ns() - start,
);
});
}
if self.chain_info().best_block_hash != original_best {
self.miner.update_sealing(self);
}
self.notify(|notify| {
notify.new_blocks(
vec![h.clone()],
vec![],
enacted.clone(),
retracted.clone(),
vec![h.clone()],
precise_time_ns() - start,
);
});
Ok(h) Ok(h)
} }
} }