X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=2da764b300b8bc2425aa7ff252fbba3749cdb7e9;hb=feca83a8a8e3942445b41a2066f03a1d9210d723;hp=746b6228cb3ab0ea79ae33d7bca7f685c7a18ab4;hpb=e1c1ac7576bb74678d65b34b19cd091fc0bb371e;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 746b6228..2da764b3 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -259,7 +259,17 @@ macro_rules! get_feerate {
 
 macro_rules! get_local_commitment_txn {
 	($node: expr, $channel_id: expr) => {
-		$node.node.channel_state.lock().unwrap().by_id.get_mut(&$channel_id).unwrap().channel_monitor().get_latest_local_commitment_txn()
+		{
+			let mut monitors = $node.chan_monitor.simple_monitor.monitors.lock().unwrap();
+			let mut commitment_txn = None;
+			for (funding_txo, monitor) in monitors.iter_mut() {
+				if funding_txo.to_channel_id() == $channel_id {
+					commitment_txn = Some(monitor.get_latest_local_commitment_txn());
+					break;
+				}
+			}
+			commitment_txn.unwrap()
+		}
 	}
 }