enable force sealing

This commit is contained in:
keorn 2016-11-14 13:35:16 +00:00
parent 165e2bef75
commit 8a86c11375

View File

@ -435,7 +435,7 @@ impl Miner {
let last_request = *self.sealing_block_last_request.lock(); let last_request = *self.sealing_block_last_request.lock();
let should_disable_sealing = !self.forced_sealing() let should_disable_sealing = !self.forced_sealing()
&& !has_local_transactions && !has_local_transactions
&& !self.seals_internally && !self.seals_internally
&& best_block > last_request && best_block > last_request
&& best_block - last_request > SEALING_TIMEOUT_IN_BLOCKS; && best_block - last_request > SEALING_TIMEOUT_IN_BLOCKS;
@ -479,7 +479,7 @@ impl Miner {
/// Uses Engine to seal the block internally and then imports it to chain. /// Uses Engine to seal the block internally and then imports it to chain.
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() { if !block.transactions().is_empty() || self.forced_sealing() {
if let Ok(sealed) = self.seal_block_internally(block) { if let Ok(sealed) = self.seal_block_internally(block) {
if chain.import_block(sealed.rlp_bytes()).is_ok() { if chain.import_block(sealed.rlp_bytes()).is_ok() {
trace!(target: "miner", "import_block_internally: imported internally sealed block"); trace!(target: "miner", "import_block_internally: imported internally sealed block");