Update WatchtowerPersister to use channel_id

The WatchtowerPersister test utility keys its maps using the channel's
funding_outpoint. Since this is being removed from the Persist trait in
the next commit, update the maps to be keyed by ChannelId instead. This
is fine for testing where there isn't any previously persisted data.

Author: jkczyz

lightning/src/ln/functional_tests.rs

@@ -2648,8 +2648,7 @@ fn do_test_forming_justice_tx_from_monitor_updates(broadcast_initial_commitment:
 	let node_cfgs = create_node_cfgs_with_persisters(2, &chanmon_cfgs, persisters.iter().collect());
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
-	let (_, _, channel_id, funding_tx) = create_announced_chan_between_nodes(&nodes, 0, 1);
-	let funding_txo = OutPoint { txid: funding_tx.compute_txid(), index: 0 };
+	let (_, _, channel_id, _) = create_announced_chan_between_nodes(&nodes, 0, 1);
 
 	if !broadcast_initial_commitment {
 		// Send a payment to move the channel forward
@@ -2665,7 +2664,7 @@ fn do_test_forming_justice_tx_from_monitor_updates(broadcast_initial_commitment:
 	// Send another payment, now revoking the previous commitment tx
 	send_payment(&nodes[0], &vec!(&nodes[1])[..], 5_000_000);
 
-	let justice_tx = persisters[1].justice_tx(funding_txo, &revoked_commitment_tx.compute_txid()).unwrap();
+	let justice_tx = persisters[1].justice_tx(channel_id, &revoked_commitment_tx.compute_txid()).unwrap();
 	check_spends!(justice_tx, revoked_commitment_tx);
 
 	mine_transactions(&nodes[1], &[revoked_commitment_tx, &justice_tx]);

lightning/src/util/test_utils.rs

@@ -533,10 +533,10 @@ pub(crate) struct WatchtowerPersister {
 	/// ChannelMonitorUpdateStep::LatestCounterpartyCommitmentTxInfo. We'll store the justice tx
 	/// amount, and commitment number so we can build the justice tx after our counterparty
 	/// revokes it.
-	unsigned_justice_tx_data: Mutex<HashMap<OutPoint, VecDeque<JusticeTxData>>>,
+	unsigned_justice_tx_data: Mutex<HashMap<ChannelId, VecDeque<JusticeTxData>>>,
 	/// After receiving a revoke_and_ack for a commitment number, we'll form and store the justice
 	/// tx which would be used to provide a watchtower with the data it needs.
-	watchtower_state: Mutex<HashMap<OutPoint, HashMap<Txid, Transaction>>>,
+	watchtower_state: Mutex<HashMap<ChannelId, HashMap<Txid, Transaction>>>,
 	destination_script: ScriptBuf,
 }
 
@@ -556,12 +556,12 @@ impl WatchtowerPersister {
 
 	#[cfg(test)]
 	pub(crate) fn justice_tx(
-		&self, funding_txo: OutPoint, commitment_txid: &Txid,
+		&self, channel_id: ChannelId, commitment_txid: &Txid,
 	) -> Option<Transaction> {
 		self.watchtower_state
 			.lock()
 			.unwrap()
-			.get(&funding_txo)
+			.get(&channel_id)
 			.unwrap()
 			.get(commitment_txid)
 			.cloned()
@@ -596,13 +596,13 @@ impl<Signer: sign::ecdsa::EcdsaChannelSigner> Persist<Signer> for WatchtowerPers
 			.unsigned_justice_tx_data
 			.lock()
 			.unwrap()
-			.insert(funding_txo, VecDeque::new())
+			.insert(data.channel_id(), VecDeque::new())
 			.is_none());
 		assert!(self
 			.watchtower_state
 			.lock()
 			.unwrap()
-			.insert(funding_txo, new_hash_map())
+			.insert(data.channel_id(), new_hash_map())
 			.is_none());
 
 		let initial_counterparty_commitment_tx =
@@ -613,7 +613,7 @@ impl<Signer: sign::ecdsa::EcdsaChannelSigner> Persist<Signer> for WatchtowerPers
 			self.unsigned_justice_tx_data
 				.lock()
 				.unwrap()
-				.get_mut(&funding_txo)
+				.get_mut(&data.channel_id())
 				.unwrap()
 				.push_back(justice_data);
 		}
@@ -632,7 +632,7 @@ impl<Signer: sign::ecdsa::EcdsaChannelSigner> Persist<Signer> for WatchtowerPers
 				.into_iter()
 				.filter_map(|commitment_tx| self.form_justice_data_from_commitment(&commitment_tx));
 			let mut channels_justice_txs = self.unsigned_justice_tx_data.lock().unwrap();
-			let channel_state = channels_justice_txs.get_mut(&funding_txo).unwrap();
+			let channel_state = channels_justice_txs.get_mut(&data.channel_id()).unwrap();
 			channel_state.extend(justice_datas);
 
 			while let Some(JusticeTxData { justice_tx, value, commitment_number }) =
@@ -651,7 +651,7 @@ impl<Signer: sign::ecdsa::EcdsaChannelSigner> Persist<Signer> for WatchtowerPers
 							.watchtower_state
 							.lock()
 							.unwrap()
-							.get_mut(&funding_txo)
+							.get_mut(&data.channel_id())
 							.unwrap()
 							.insert(commitment_txid, signed_justice_tx);
 						assert!(dup.is_none());