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

Disable max seal period for external sealing (#4927)

Browse Source 
* no max sealing when external

* force internal sealing
This commit is contained in:
keorn 2017-03-20 18:14:49 +00:00 committed by Gav Wood
parent 05cd715c39
commit e228de18e2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/miner/miner.rs
View File

@ -304,9 +304,7 @@ impl Miner {
} }
fn forced_sealing(&self) -> bool { fn forced_sealing(&self) -> bool {
self.options.force_sealing self.options.force_sealing || !self.notifiers.read().is_empty()
|| !self.notifiers.read().is_empty()
|| Instant::now() > *self.next_mandatory_reseal.read()
} }
/// Clear all pending block states /// Clear all pending block states
@ -484,7 +482,7 @@ impl Miner {
/// Attempts to perform internal sealing (one that does not require work) and handles the result depending on the type of Seal. /// Attempts to perform internal sealing (one that does not require work) and handles the result depending on the type of Seal.
fn seal_and_import_block_internally(&self, chain: &MiningBlockChainClient, block: ClosedBlock) -> bool { fn seal_and_import_block_internally(&self, chain: &MiningBlockChainClient, block: ClosedBlock) -> bool {
if !block.transactions().is_empty() || self.forced_sealing() { if !block.transactions().is_empty() || self.forced_sealing() || Instant::now() > *self.next_mandatory_reseal.read() {
trace!(target: "miner", "seal_block_internally: attempting internal seal."); trace!(target: "miner", "seal_block_internally: attempting internal seal.");
match self.engine.generate_seal(block.block()) { match self.engine.generate_seal(block.block()) {
// Save proposal for later seal submission and broadcast it. // Save proposal for later seal submission and broadcast it.