Use the TxOutRef type for the ChannelMonitor's funding_txo field.

Signed-off-by: Jean Pierre Dudey <[email protected]>

Author: jeandudey

fuzz/fuzz_targets/full_stack_target.rs

@@ -4,7 +4,7 @@ extern crate lightning;
 extern crate secp256k1;
 
 use bitcoin::blockdata::block::BlockHeader;
-use bitcoin::blockdata::transaction::{Transaction, TxOut};
+use bitcoin::blockdata::transaction::{Transaction, TxOut, TxOutRef};
 use bitcoin::blockdata::script::Script;
 use bitcoin::network::constants::Network;
 use bitcoin::network::serialize::{serialize, BitcoinHash};
@@ -93,7 +93,7 @@ impl FeeEstimator for FuzzEstimator {
 
 struct TestChannelMonitor {}
 impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
-	fn add_update_monitor(&self, _funding_txo: (Sha256dHash, u16), _monitor: channelmonitor::ChannelMonitor) -> Result<(), channelmonitor::ChannelMonitorUpdateErr> {
+	fn add_update_monitor(&self, _funding_txo: TxOutRef, _monitor: channelmonitor::ChannelMonitor) -> Result<(), channelmonitor::ChannelMonitorUpdateErr> {
 		//TODO!
 		Ok(())
 	}
@@ -280,7 +280,10 @@ pub fn do_test(data: &[u8]) {
 					let mut tx = Transaction { version: 0, lock_time: 0, input: Vec::new(), output: vec![TxOut {
 							value: funding_generation.1, script_pubkey: funding_generation.2,
 						}] };
-					let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+					let funding_output = TxOutRef {
+						txid: Sha256dHash::from_data(&serialize(&tx).unwrap()[..]),
+						index: 0
+					};
 					channelmanager.funding_transaction_generated(&funding_generation.0, funding_output.clone());
 					pending_funding_signatures.insert(funding_output, tx);
 				}