f ugh just use the old function

Author: TheBlueMatt

lightning/src/routing/gossip.rs

@@ -1850,6 +1850,7 @@ mod tests {
 	use bitcoin::hashes::Hash;
 	use bitcoin::network::constants::Network;
 	use bitcoin::blockdata::constants::genesis_block;
+	use bitcoin::blockdata::script::Script;
 	use bitcoin::blockdata::transaction::TxOut;
 
 	use hex;
@@ -1939,6 +1940,13 @@ mod tests {
 		}
 	}
 
+	fn get_channel_script(secp_ctx: &Secp256k1<secp256k1::All>) -> Script {
+		let node_1_btckey = SecretKey::from_slice(&[40; 32]).unwrap();
+		let node_2_btckey = SecretKey::from_slice(&[39; 32]).unwrap();
+		make_funding_redeemscript(&PublicKey::from_secret_key(secp_ctx, &node_1_btckey),
+			&PublicKey::from_secret_key(secp_ctx, &node_2_btckey)).to_v0_p2wsh()
+	}
+
 	fn get_signed_channel_update<F: Fn(&mut UnsignedChannelUpdate)>(f: F, node_key: &SecretKey, secp_ctx: &Secp256k1<secp256k1::All>) -> ChannelUpdate {
 		let mut unsigned_channel_update = UnsignedChannelUpdate {
 			chain_hash: genesis_block(Network::Testnet).header.block_hash(),
@@ -2028,8 +2036,7 @@ mod tests {
 		let node_1_privkey = &SecretKey::from_slice(&[42; 32]).unwrap();
 		let node_2_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
 
-		let good_script = make_funding_redeemscript(&PublicKey::from_secret_key(&secp_ctx, &node_1_privkey),
-			&PublicKey::from_secret_key(&secp_ctx, &node_2_privkey)).to_v0_p2wsh();
+		let good_script = get_channel_script(&secp_ctx);
 		let valid_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 
 		// Test if the UTXO lookups were not supported
@@ -2154,9 +2161,7 @@ mod tests {
 
 		{
 			// Announce a channel we will update
-			let good_script = make_funding_redeemscript(&PublicKey::from_secret_key(&secp_ctx, &node_1_privkey),
-				&PublicKey::from_secret_key(&secp_ctx, &node_2_privkey)).to_v0_p2wsh();
-
+			let good_script = get_channel_script(&secp_ctx);
 			*chain_source.utxo_ret.lock().unwrap() = Ok(TxOut { value: amount_sats, script_pubkey: good_script.clone() });
 
 			let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);