X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=db43c37fd5eb5b8d1dd299c22f836bf017db9f42;hb=448b191fec4c6d1e9638c82aade7385b1516aa5d;hp=03ec96df7406363b91be5c88ff1c266be548eca8;hpb=b5e959460f1473022321c8b8868fb0f7da6906b5;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 03ec96df..db43c37f 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -811,36 +811,14 @@ macro_rules! get_channel_ref {
 	}
 }
 
-#[cfg(test)]
-macro_rules! get_outbound_v1_channel_ref {
-	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
-		{
-			$per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
-			$peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
-			$peer_state_lock.outbound_v1_channel_by_id.get_mut(&$channel_id).unwrap()
-		}
-	}
-}
-
-#[cfg(test)]
-macro_rules! get_inbound_v1_channel_ref {
-	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
-		{
-			$per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
-			$peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
-			$peer_state_lock.inbound_v1_channel_by_id.get_mut(&$channel_id).unwrap()
-		}
-	}
-}
-
 #[cfg(test)]
 macro_rules! get_feerate {
 	($node: expr, $counterparty_node: expr, $channel_id: expr) => {
 		{
 			let mut per_peer_state_lock;
 			let mut peer_state_lock;
-			let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
-			chan.context.get_feerate_sat_per_1000_weight()
+			let phase = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
+			phase.context().get_feerate_sat_per_1000_weight()
 		}
 	}
 }
@@ -852,7 +830,7 @@ macro_rules! get_channel_type_features {
 			let mut per_peer_state_lock;
 			let mut peer_state_lock;
 			let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
-			chan.context.get_channel_type().clone()
+			chan.context().get_channel_type().clone()
 		}
 	}
 }
@@ -2414,10 +2392,10 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, '
 						let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 							.unwrap().lock().unwrap();
 						let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
-						if let Some(prev_config) = channel.context.prev_config() {
+						if let Some(prev_config) = channel.context().prev_config() {
 							prev_config.forwarding_fee_base_msat
 						} else {
-							channel.context.config().forwarding_fee_base_msat
+							channel.context().config().forwarding_fee_base_msat
 						}
 					};
 					if $idx == 1 { fee += expected_extra_fees[i]; }
@@ -2941,7 +2919,9 @@ macro_rules! get_channel_value_stat {
 	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 		let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 		let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
-		let chan = chan_lock.channel_by_id.get(&$channel_id).unwrap();
+		let chan = chan_lock.channel_by_id.get(&$channel_id).map(
+			|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
+		).flatten().unwrap();
 		chan.get_value_stat()
 	}}
 }