X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=568dcdf0250057c68e1cf946b4b543f97c8933c0;hb=d76b43fe44facb3652e1bc06f58a832a4a1f14ff;hp=a7c50de4a471de122c501d8a5789aced9e76bf53;hpb=0da7bbd5ecc578ee13d75a31c4627070c69c875f;p=rust-lightning

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index a7c50de4..568dcdf0 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -17,14 +17,13 @@ use lightning::ln::msgs;
 use lightning::routing::gossip::{NetworkGraph, RoutingFees};
 use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
 use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
-use lightning::routing::scoring::FixedPenaltyScorer;
+use lightning::routing::scoring::ProbabilisticScorer;
 use lightning::util::config::UserConfig;
 use lightning::util::ser::Readable;
 
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::network::constants::Network;
-use bitcoin::blockdata::constants::genesis_block;
 
 use crate::utils::test_logger;
 
@@ -189,7 +188,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 	let logger = test_logger::TestLogger::new("".to_owned(), out);
 
 	let our_pubkey = get_pubkey!();
-	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
+	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 	let chain_source = FuzzChainSource {
 		input: Arc::clone(&input),
 		net_graph: &net_graph,
@@ -269,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 								inbound_htlc_minimum_msat: None,
 								inbound_htlc_maximum_msat: None,
 								config: None,
+								feerate_sat_per_1000_weight: None,
 							});
 						}
 						Some(&first_hops_vec[..])
@@ -293,7 +293,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 						}]));
 					}
 				}
-				let scorer = FixedPenaltyScorer::with_penalty(0);
+				let scorer = ProbabilisticScorer::new(Default::default(), &net_graph, &logger);
 				let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 				for target in node_pks.iter() {
 					let final_value_msat = slice_to_be64(get_slice!(8));
@@ -302,7 +302,6 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 						payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 							.with_route_hints(last_hops.clone()),
 						final_value_msat,
-						final_cltv_expiry_delta,
 					};
 					let _ = find_route(&our_pubkey, &route_params, &net_graph,
 						first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),