Fix lightning-block-sync warnings.

Author: arik-so

lightning-block-sync/src/convert.rs

@@ -622,10 +622,7 @@ pub(crate) mod tests {
 		match TryInto::<Txid>::try_into(response) {
 			Err(e) => {
 				assert_eq!(e.kind(), io::ErrorKind::InvalidData);
-				assert_eq!(
-					e.get_ref().unwrap().to_string(),
-					"bad hex string length 6 (expected 64)"
-				);
+				assert_eq!(e.get_ref().unwrap().to_string(), "failed to parse hex");
 			},
 			Ok(_) => panic!("Expected error"),
 		}
@@ -637,10 +634,7 @@ pub(crate) mod tests {
 		match TryInto::<Txid>::try_into(response) {
 			Err(e) => {
 				assert_eq!(e.kind(), io::ErrorKind::InvalidData);
-				assert_eq!(
-					e.get_ref().unwrap().to_string(),
-					"bad hex string length 4 (expected 64)"
-				);
+				assert_eq!(e.get_ref().unwrap().to_string(), "failed to parse hex");
 			},
 			Ok(_) => panic!("Expected error"),
 		}

lightning-block-sync/src/gossip.rs

@@ -198,7 +198,7 @@ where
 						return Err(UtxoLookupError::UnknownTx);
 					}
 
-					outpoint = OutPoint::new(transaction.txid(), output_index.into());
+					outpoint = OutPoint::new(transaction.compute_txid(), output_index.into());
 					output = transaction.output[output_index as usize].clone();
 				}};
 			}

lightning-block-sync/src/poll.rs

@@ -144,8 +144,8 @@ impl ValidatedBlockHeader {
 			if self.height % 2016 == 0 {
 				let target = self.header.target();
 				let previous_target = previous_header.header.target();
-				let min_target = previous_target.min_difficulty_transition_threshold();
-				let max_target = previous_target.max_difficulty_transition_threshold();
+				let min_target = previous_target.min_transition_threshold();
+				let max_target = previous_target.max_transition_threshold_unchecked();
 				if target > max_target || target < min_target {
 					return Err(BlockSourceError::persistent("invalid difficulty transition"));
 				}

lightning-block-sync/src/test_utils.rs

@@ -53,7 +53,7 @@ impl Blockchain {
 				input: vec![],
 				output: vec![],
 			};
-			let merkle_root = TxMerkleNode::from_raw_hash(coinbase.txid().to_raw_hash());
+			let merkle_root = TxMerkleNode::from_raw_hash(coinbase.compute_txid().to_raw_hash());
 			self.blocks.push(Block {
 				header: Header {
 					version: Version::NO_SOFT_FORK_SIGNALLING,

lightning-block-sync/src/utils.rs

@@ -9,7 +9,6 @@ pub fn hex_to_work(hex: &str) -> Result<Work, HexToArrayError> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bitcoin::hex::HexToBytesError;
 	use bitcoin::pow::Work;
 
 	#[test]
@@ -20,31 +19,25 @@ mod tests {
 	#[test]
 	fn hex_to_work_too_short_str() {
 		let hex = String::from_utf8(vec![b'0'; 32]).unwrap();
-		assert_eq!(hex_to_work(&hex), Err(HexToArrayError::InvalidLength(32, 64)));
+		assert!(hex_to_work(&hex).is_err());
 	}
 
 	#[test]
 	fn hex_to_work_too_long_str() {
 		let hex = String::from_utf8(vec![b'0'; 128]).unwrap();
-		assert_eq!(hex_to_work(&hex), Err(HexToArrayError::InvalidLength(128, 64)));
+		assert!(hex_to_work(&hex).is_err());
 	}
 
 	#[test]
 	fn hex_to_work_odd_length_str() {
 		let hex = String::from_utf8(vec![b'0'; 65]).unwrap();
-		assert_eq!(
-			hex_to_work(&hex),
-			Err(HexToArrayError::Conversion(HexToBytesError::OddLengthString(65)))
-		);
+		assert!(hex_to_work(&hex).is_err());
 	}
 
 	#[test]
 	fn hex_to_work_invalid_char() {
 		let hex = String::from_utf8(vec![b'G'; 64]).unwrap();
-		assert_eq!(
-			hex_to_work(&hex),
-			Err(HexToArrayError::Conversion(HexToBytesError::InvalidChar(b'G')))
-		);
+		assert!(hex_to_work(&hex).is_err());
 	}
 
 	#[test]