Rebase adaptation

Author: optout21

lightning/src/ln/msgs.rs

@@ -451,7 +451,7 @@ pub struct Splice {
 	/// The channel ID where splicing is intended
 	pub channel_id: ChannelId,
 	/// The genesis hash of the blockchain where the channel is intended to be spliced
-	pub chain_hash: BlockHash,
+	pub chain_hash: ChainHash,
 	/// The intended change in channel capacity: the amount to be added (positive value)
 	/// or removed (negative value) by the sender (splice initiator) by splicing into/from the channel.
 	pub relative_satoshis: i64,
@@ -471,7 +471,7 @@ pub struct SpliceAck {
 	/// The channel ID where splicing is intended
 	pub channel_id: ChannelId,
 	/// The genesis hash of the blockchain where the channel is intended to be spliced
-	pub chain_hash: BlockHash,
+	pub chain_hash: ChainHash,
 	/// The intended change in channel capacity: the amount to be added (positive value)
 	/// or removed (negative value) by the sender (splice acceptor) by splicing into/from the channel.
 	pub relative_satoshis: i64,
@@ -3445,29 +3445,29 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
 		let (_, pubkey_1,) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 		let splice = msgs::Splice {
-			chain_hash: BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
+			chain_hash: ChainHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
 			channel_id: ChannelId::from_bytes([2; 32]),
 			relative_satoshis: 123456,
 			funding_feerate_perkw: 2000,
 			locktime: 0,
 			funding_pubkey: pubkey_1,
 		};
 		let encoded_value = splice.encode();
-		assert_eq!(hex::encode(encoded_value), "0202020202020202020202020202020202020202020202020202020202020202000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f000000000001e240000007d000000000031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
+		assert_eq!(hex::encode(encoded_value), "02020202020202020202020202020202020202020202020202020202020202026fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000000000000001e240000007d000000000031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
 	}
 
 	#[test]
 	fn encoding_splice_ack() {
 		let secp_ctx = Secp256k1::new();
 		let (_, pubkey_1,) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 		let splice = msgs::SpliceAck {
-			chain_hash: BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
+			chain_hash: ChainHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
 			channel_id: ChannelId::from_bytes([2; 32]),
 			relative_satoshis: 123456,
 			funding_pubkey: pubkey_1,
 		};
 		let encoded_value = splice.encode();
-		assert_eq!(hex::encode(encoded_value), "0202020202020202020202020202020202020202020202020202020202020202000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f000000000001e240031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
+		assert_eq!(hex::encode(encoded_value), "02020202020202020202020202020202020202020202020202020202020202026fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000000000000001e240031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
 	}
 
 	#[test]