From 6440ca2f68a1689d9aa89a8b76681a844f0e1abb Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Wed, 7 Dec 2016 14:39:37 +0100
Subject: [PATCH] move stuff around

---
 ethcore/src/engines/tendermint/mod.rs | 1 +
 ethcore/src/miner/miner.rs            | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index c6c5c1ad4..6f7ce2097 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -382,6 +382,7 @@ impl Engine for Tendermint {
 	}
 
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
+		header.set_difficulty(parent.difficulty().clone());
 		header.set_gas_limit({
 			let gas_limit = parent.gas_limit().clone();
 			let bound_divisor = self.our_params.gas_limit_bound_divisor;
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 806ff6964..892e37f40 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -480,6 +480,9 @@ impl Miner {
 
 	/// 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 {
+		let mut sealing_work = self.sealing_work.lock();
+		sealing_work.queue.push(block.clone());
+		sealing_work.queue.use_last_ref();
 		if !block.transactions().is_empty() || self.forced_sealing() {
 			if let Ok(sealed) = self.seal_block_internally(block) {
 				if chain.import_sealed_block(sealed).is_ok() {
@@ -1015,7 +1018,6 @@ impl MinerService for Miner {
 		self.transaction_queue.lock().last_nonce(address)
 	}
 
-
 	/// Update sealing if required.
 	/// Prepare the block and work if the Engine does not seal internally.
 	fn update_sealing(&self, chain: &MiningBlockChainClient) {
@@ -1030,11 +1032,6 @@ impl MinerService for Miner {
 			let (block, original_work_hash) = self.prepare_block(chain);
 			if self.seals_internally {
 				trace!(target: "miner", "update_sealing: engine indicates internal sealing");
-				{
-					let mut sealing_work = self.sealing_work.lock();
-					sealing_work.queue.push(block.clone());
-					sealing_work.queue.use_last_ref();
-				}
 				self.seal_and_import_block_internally(chain, block);
 			} else {
 				trace!(target: "miner", "update_sealing: engine does not seal internally, preparing work");