X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=c9ceea3d0b3d196169d47a996f4e4a47237098aa;hb=185fbc176579f062d82b548a7a3446d975c450a3;hp=830f6f4e201cb3d91155dca468492d586133b031;hpb=e99e6ab562af9b9a7e0f2d0dc1fee3dd09bb4082;p=rust-lightning

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index 830f6f4e..c9ceea3d 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -7,9 +7,9 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use bitcoin::blockdata::constants::ChainHash;
 use bitcoin::blockdata::script::Builder;
 use bitcoin::blockdata::transaction::TxOut;
-use bitcoin::hash_types::BlockHash;
 
 use lightning::blinded_path::{BlindedHop, BlindedPath};
 use lightning::chain::transaction::OutPoint;
@@ -89,7 +89,7 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
 	net_graph: &'a NetworkGraph<&'b test_logger::TestLogger<Out>>,
 }
 impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
-	fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult {
+	fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
 		let input_slice = self.input.get_slice(2);
 		if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
 		let input_slice = input_slice.unwrap();
@@ -233,6 +233,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 							force_close_spend_delay: None,
 							is_outbound: true, is_channel_ready: true,
 							is_usable: true, is_public: true,
+							balance_msat: 0,
 							outbound_capacity_msat: capacity.saturating_mul(1000),
 							next_outbound_htlc_limit_msat: capacity.saturating_mul(1000),
 							next_outbound_htlc_minimum_msat: 0,
@@ -326,11 +327,10 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 				let mut last_hops = Vec::new();
 				last_hops!(last_hops);
 				find_routes!(first_hops, node_pks.iter(), |final_amt, final_delta, target: &PublicKey| {
-					RouteParameters {
-						payment_params: PaymentParameters::from_node_id(*target, final_delta)
+					RouteParameters::from_payment_params_and_value(
+						PaymentParameters::from_node_id(*target, final_delta)
 							.with_route_hints(last_hops.clone()).unwrap(),
-						final_value_msat: final_amt,
-					}
+						final_amt)
 				});
 			},
 			x => {
@@ -366,11 +366,9 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 				let mut features = Bolt12InvoiceFeatures::empty();
 				features.set_basic_mpp_optional();
 				find_routes!(first_hops, vec![dummy_pk].iter(), |final_amt, _, _| {
-					RouteParameters {
-						payment_params: PaymentParameters::blinded(last_hops.clone())
-							.with_bolt12_features(features.clone()).unwrap(),
-						final_value_msat: final_amt,
-					}
+					RouteParameters::from_payment_params_and_value(PaymentParameters::blinded(last_hops.clone())
+						.with_bolt12_features(features.clone()).unwrap(),
+					final_amt)
 				});
 			}
 		}