X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=lightning-block-sync%2Fsrc%2Fpoll.rs;h=4c6cb0c0600725e9cf3552045865e8b5be472199;hb=f99301dd8a7f056c0ed09ec827fddc00f325b3e5;hp=6e30d2e86d20d268529bd37d942492db810d84b6;hpb=742f5e59b9f6cd24588df02cbb3b84dcc16b693d;p=rust-lightning

diff --git a/lightning-block-sync/src/poll.rs b/lightning-block-sync/src/poll.rs
index 6e30d2e8..4c6cb0c0 100644
--- a/lightning-block-sync/src/poll.rs
+++ b/lightning-block-sync/src/poll.rs
@@ -59,12 +59,11 @@ impl Validate for BlockHeaderData {
 	type T = ValidatedBlockHeader;
 
 	fn validate(self, block_hash: BlockHash) -> BlockSourceResult<Self::T> {
-		self.header
+		let pow_valid_block_hash = self.header
 			.validate_pow(&self.header.target())
 			.or_else(|e| Err(BlockSourceError::persistent(e)))?;
 
-		// TODO: Use the result of validate_pow instead of recomputing the block hash once upstream.
-		if self.header.block_hash() != block_hash {
+		if pow_valid_block_hash != block_hash {
 			return Err(BlockSourceError::persistent("invalid block hash"));
 		}
 
@@ -76,12 +75,11 @@ impl Validate for Block {
 	type T = ValidatedBlock;
 
 	fn validate(self, block_hash: BlockHash) -> BlockSourceResult<Self::T> {
-		self.header
+		let pow_valid_block_hash = self.header
 			.validate_pow(&self.header.target())
 			.or_else(|e| Err(BlockSourceError::persistent(e)))?;
 
-		// TODO: Use the result of validate_pow instead of recomputing the block hash once upstream.
-		if self.block_hash() != block_hash {
+		if pow_valid_block_hash != block_hash {
 			return Err(BlockSourceError::persistent("invalid block hash"));
 		}