Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Disable max seal period for external sealing #4927

Merged
merged 4 commits into from
Mar 20, 2017
Merged

Disable max seal period for external sealing #4927

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b06e130
no max sealing when external
Mar 15, 2017
5989032
force internal sealing
Mar 16, 2017
ad36e55
Merge branch 'master' of github.com:ethcore/parity into max-work-sealing
debris Mar 17, 2017
8bfe66f
Merge remote-tracking branch 'origin/master' into max-work-sealing
NikVolf Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ethcore/src/miner/miner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,7 @@ impl Miner {
}

fn forced_sealing(&self) -> bool {
self.options.force_sealing
|| !self.notifiers.read().is_empty()
|| Instant::now() > *self.next_mandatory_reseal.read()
self.options.force_sealing || !self.notifiers.read().is_empty()
}

/// Clear all pending block states
Expand Down Expand Up @@ -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.
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.");
match self.engine.generate_seal(block.block()) {
// Save proposal for later seal submission and broadcast it.
Expand Down