f fix test + drop missing imports

Author: TheBlueMatt

lightning/src/routing/gossip.rs

@@ -16,9 +16,7 @@ use bitcoin::secp256k1;
 
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hashes::Hash;
-use bitcoin::blockdata::script::Builder;
 use bitcoin::blockdata::transaction::TxOut;
-use bitcoin::blockdata::opcodes;
 use bitcoin::hash_types::BlockHash;
 
 use chain;
@@ -1834,6 +1832,7 @@ impl ReadOnlyNetworkGraph<'_> {
 #[cfg(test)]
 mod tests {
 	use chain;
+	use ln::chan_utils::make_funding_redeemscript;
 	use ln::PaymentHash;
 	use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 	use routing::gossip::{P2PGossipSync, NetworkGraph, NetworkUpdate, NodeAlias, MAX_EXCESS_BYTES_FOR_RELAY, NodeId, RoutingFees, ChannelUpdateInfo, ChannelInfo, NodeAnnouncementInfo, NodeInfo};
@@ -1851,9 +1850,8 @@ mod tests {
 	use bitcoin::hashes::Hash;
 	use bitcoin::network::constants::Network;
 	use bitcoin::blockdata::constants::genesis_block;
-	use bitcoin::blockdata::script::{Builder, Script};
+	use bitcoin::blockdata::script::Script;
 	use bitcoin::blockdata::transaction::TxOut;
-	use bitcoin::blockdata::opcodes;
 
 	use hex;
 
@@ -1942,17 +1940,6 @@ 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();
-		Builder::new().push_opcode(opcodes::all::OP_PUSHNUM_2)
-		              .push_slice(&PublicKey::from_secret_key(&secp_ctx, node_1_btckey).serialize())
-		              .push_slice(&PublicKey::from_secret_key(&secp_ctx, node_2_btckey).serialize())
-		              .push_opcode(opcodes::all::OP_PUSHNUM_2)
-		              .push_opcode(opcodes::all::OP_CHECKMULTISIG).into_script()
-		              .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(),
@@ -2042,7 +2029,8 @@ 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 = get_channel_script(&secp_ctx);
+		let good_script = make_funding_redeemscript(&PublicKey::from_secret_key(secp_ctx, &node_1_btckey),
+			&PublicKey::from_secret_key(secp_ctx, &node_2_btckey)).to_v0_p2wsh();
 		let valid_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 
 		// Test if the UTXO lookups were not supported
@@ -2167,7 +2155,9 @@ mod tests {
 
 		{
 			// Announce a channel we will update
-			let good_script = get_channel_script(&secp_ctx);
+			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();
+
 			*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);