X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=00054a83b27ae4cd0d7fe5dd00ecabb2ba66ca1f;hb=ed5f9f6a9b9f9fc84810cdc1c04ff0a1caa888ff;hp=b7200e102f93fabc90aa31c969bb83d20c04effe;hpb=486c16a26d6f833b99bff251dfd8acbbd37bdf03;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index b7200e10..00054a83 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -783,6 +783,28 @@ 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) => {
@@ -790,19 +812,19 @@ macro_rules! get_feerate {
 			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.get_feerate_sat_per_1000_weight()
+			chan.context.get_feerate_sat_per_1000_weight()
 		}
 	}
 }
 
 #[cfg(test)]
-macro_rules! get_opt_anchors {
+macro_rules! get_channel_type_features {
 	($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.opt_anchors()
+			chan.context.get_channel_type().clone()
 		}
 	}
 }
@@ -2115,7 +2137,7 @@ pub fn do_pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_p
 							},
 							PaymentPurpose::SpontaneousPayment(payment_preimage) => {
 								assert_eq!(expected_preimage.unwrap(), *payment_preimage);
-								assert!(our_payment_secret.is_none());
+								assert_eq!(our_payment_secret, onion_fields.as_ref().unwrap().payment_secret);
 							},
 						}
 						assert_eq!(*amount_msat, recv_value);
@@ -2237,10 +2259,10 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
 						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.prev_config() {
+						if let Some(prev_config) = channel.context.prev_config() {
 							prev_config.forwarding_fee_base_msat
 						} else {
-							channel.config().forwarding_fee_base_msat
+							channel.context.config().forwarding_fee_base_msat
 						}
 					};
 					expect_payment_forwarded!($node, $next_node, $prev_node, Some(fee as u64), false, false);