X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=efa244d9bf5cb6eb4715730fff3f2baca5f9f2f7;hb=35d4ebb208255724804187e3f10553c9383c9522;hp=e8e025e247b2ec7c7442ce05c72363946d9bc85b;hpb=7b4b75301047b7c122fb1e893658384e726ec60c;p=rust-lightning

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index e8e025e2..efa244d9 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -13,10 +13,11 @@ use bitcoin::hash_types::BlockHash;
 
 use lightning::chain;
 use lightning::chain::transaction::OutPoint;
-use lightning::ln::channelmanager::ChannelDetails;
+use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
 use lightning::ln::features::InitFeatures;
 use lightning::ln::msgs;
-use lightning::routing::router::{get_route, RouteHint, RouteHintHop};
+use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
+use lightning::routing::scoring::Scorer;
 use lightning::util::logger::Logger;
 use lightning::util::ser::Readable;
 use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
@@ -160,7 +161,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
 
 	let our_pubkey = get_pubkey!();
-	let mut net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash());
+	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash());
 
 	let mut node_pks = HashSet::new();
 	let mut scid = 42;
@@ -207,19 +208,23 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 							let rnid = node_pks.iter().skip(slice_to_be16(get_slice!(2))as usize % node_pks.len()).next().unwrap();
 							first_hops_vec.push(ChannelDetails {
 								channel_id: [0; 32],
+								counterparty: ChannelCounterparty {
+									node_id: *rnid,
+									features: InitFeatures::known(),
+									unspendable_punishment_reserve: 0,
+									forwarding_info: None,
+								},
 								funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 								short_channel_id: Some(scid),
-								remote_network_id: *rnid,
-								counterparty_features: InitFeatures::known(),
 								channel_value_satoshis: slice_to_be64(get_slice!(8)),
-								user_id: 0,
-								inbound_capacity_msat: 0,
-								is_outbound: true,
-								is_funding_locked: true,
-								is_usable: true,
-								is_public: true,
+								user_channel_id: 0, inbound_capacity_msat: 0,
+								unspendable_punishment_reserve: None,
+								confirmations_required: None,
+								force_close_spend_delay: None,
+								is_outbound: true, is_funding_locked: true,
+								is_usable: true, is_public: true,
+								balance_msat: 0,
 								outbound_capacity_msat: 0,
-								counterparty_forwarding_info: None,
 							});
 						}
 						Some(&first_hops_vec[..])
@@ -244,11 +249,16 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 						}]));
 					}
 				}
+				let scorer = Scorer::with_fixed_penalty(0);
 				for target in node_pks.iter() {
-					let _ = get_route(&our_pubkey, &net_graph, target, None,
+					let route_params = RouteParameters {
+						payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
+						final_value_msat: slice_to_be64(get_slice!(8)),
+						final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
+					};
+					let _ = find_route(&our_pubkey, &route_params, &net_graph,
 						first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
-						&last_hops.iter().collect::<Vec<_>>(),
-						slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger));
+						Arc::clone(&logger), &scorer);
 				}
 			},
 		}