Last fixes that should have been part of #1534

core/src/pow/types.rs

@@ -238,9 +238,9 @@ impl ProofOfWork {
 	pub fn write<W: Writer>(&self, ver: u16, writer: &mut W) -> Result<(), ser::Error> {
 		if writer.serialization_mode() != ser::SerializationMode::Hash {
 			self.write_pre_pow(ver, writer)?;
+			writer.write_u64(self.nonce)?;
 		}
 
-		writer.write_u64(self.nonce)?;
 		self.proof.write(writer)?;
 		Ok(())
 	}

servers/src/mining/test_miner.rs

@@ -26,7 +26,7 @@ use common::types::StratumServerConfig;
 use core::core::hash::{Hash, Hashed};
 use core::core::verifier_cache::VerifierCache;
 use core::core::{Block, BlockHeader};
-use core::pow::{cuckoo, Proof};
+use core::pow::cuckoo;
 use core::{consensus, global};
 use mining::mine_block;
 use pool;