X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=50aed2c5b4355283f77695708235c25f5d36d761;hb=ec3aa494953c7d720370119f673e8e6b3a2155d5;hp=ca6c1eb29538c5b9291080178ebf362403b4da7f;hpb=bc544414247af4ceeaa53c0b3f204d7fad85d4b8;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index ca6c1eb2..50aed2c5 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -30,7 +30,6 @@ use crate::util::config::UserConfig;
 use crate::util::ser::{ReadableArgs, Writeable};
 
 use bitcoin::blockdata::block::{Block, BlockHeader};
-use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::blockdata::transaction::{Transaction, TxOut};
 use bitcoin::network::constants::Network;
 
@@ -2276,8 +2275,8 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
 		.with_features(expected_route.last().unwrap().node.invoice_features());
 	let route = get_route(origin_node, &payment_params, recv_value, TEST_FINAL_CLTV).unwrap();
 	assert_eq!(route.paths.len(), 1);
-	assert_eq!(route.paths[0].len(), expected_route.len());
-	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
+	assert_eq!(route.paths[0].hops.len(), expected_route.len());
+	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
 		assert_eq!(hop.pubkey, node.node.get_our_node_id());
 	}
 
@@ -2297,8 +2296,8 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
 		&origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 		None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
 	assert_eq!(route.paths.len(), 1);
-	assert_eq!(route.paths[0].len(), expected_route.len());
-	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
+	assert_eq!(route.paths[0].hops.len(), expected_route.len());
+	for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {
 		assert_eq!(hop.pubkey, node.node.get_our_node_id());
 	}
 
@@ -2404,7 +2403,7 @@ pub fn pass_failed_payment_back<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expe
 					assert_eq!(payment_hash, our_payment_hash);
 					assert!(payment_failed_permanently);
 					for (idx, hop) in expected_route.iter().enumerate() {
-						assert_eq!(hop.node.get_our_node_id(), path[idx].pubkey);
+						assert_eq!(hop.node.get_our_node_id(), path.hops[idx].pubkey);
 					}
 					payment_id.unwrap()
 				},