Clean up types.rs hex deser to use more intermediate variables

...preventing rustfmt from making a mockery of our code.

Author: TheBlueMatt

lightning/src/ln/types.rs

@@ -133,7 +133,6 @@ mod tests {
 	use bitcoin::hashes::{
 		Hash as _,
 		HashEngine as _,
-		hex::FromHex as _,
 		sha256::Hash as Sha256,
 	};
 	use bitcoin::secp256k1::PublicKey;
@@ -146,10 +145,13 @@ mod tests {
 	use crate::prelude::*;
 	use crate::io;
 
+	use core::str::FromStr;
+
 	#[test]
 	fn test_channel_id_v1_from_funding_txid() {
 		let channel_id = ChannelId::v1_from_funding_txid(&[2; 32], 1);
-		assert_eq!(channel_id.0.as_hex().to_string(), "0202020202020202020202020202020202020202020202020202020202020203");
+		let expected = "0202020202020202020202020202020202020202020202020202020202020203";
+		assert_eq!(channel_id.0.as_hex().to_string(), expected);
 	}
 
 	#[test]
@@ -184,14 +186,17 @@ mod tests {
 	#[test]
 	fn test_channel_id_display() {
 		let channel_id = ChannelId::v1_from_funding_txid(&[2; 32], 1);
-		assert_eq!(format!("{}", &channel_id), "0202020202020202020202020202020202020202020202020202020202020203");
+		let expected = "0202020202020202020202020202020202020202020202020202020202020203";
+		assert_eq!(format!("{}", &channel_id), expected);
 	}
 
 	#[test]
 	fn test_channel_id_v2_from_basepoints() {
 		// Ours greater than theirs
-		let ours = RevocationBasepoint(PublicKey::from_slice(&<Vec<u8>>::from_hex("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c").unwrap()[..]).unwrap());
-		let theirs = RevocationBasepoint(PublicKey::from_slice(&<Vec<u8>>::from_hex("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619").unwrap()[..]).unwrap());
+		let our_pk = "0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c";
+		let ours = RevocationBasepoint(PublicKey::from_str(&our_pk).unwrap());
+		let their_pk = "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619";
+		let theirs = RevocationBasepoint(PublicKey::from_str(&their_pk).unwrap());
 
 		let mut engine = Sha256::engine();
 		engine.input(&theirs.0.serialize());
@@ -201,8 +206,10 @@ mod tests {
 		assert_eq!(ChannelId::v2_from_revocation_basepoints(&ours, &theirs), expected_id);
 
 		// Theirs greater than ours
-		let ours = RevocationBasepoint(PublicKey::from_slice(&<Vec<u8>>::from_hex("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007").unwrap()[..]).unwrap());
-		let theirs = RevocationBasepoint(PublicKey::from_slice(&<Vec<u8>>::from_hex("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619").unwrap()[..]).unwrap());
+		let our_pk = "027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007";
+		let ours = RevocationBasepoint(PublicKey::from_str(&our_pk).unwrap());
+		let their_pk = "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619";
+		let theirs = RevocationBasepoint(PublicKey::from_str(&their_pk).unwrap());
 
 		let mut engine = Sha256::engine();
 		engine.input(&ours.0.serialize());