X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=b7d45bf729f4d6c488c5916de536a5cf6f02f6dc;hb=4f4e84ef4d39a0fc81b3fd3c6c54611616860844;hp=653491024d5745d1e687e8ab16e1b46920db57c3;hpb=4a4163fcf4842d7531e8730a6327764277aadf99;p=rust-lightning

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index 65349102..b7d45bf7 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -13,6 +13,7 @@ use bitcoin::hash_types::BlockHash;
 
 use lightning::blinded_path::{BlindedHop, BlindedPath};
 use lightning::chain::transaction::OutPoint;
+use lightning::ln::ChannelId;
 use lightning::ln::channelmanager::{self, ChannelDetails, ChannelCounterparty};
 use lightning::ln::features::{BlindedHopFeatures, Bolt12InvoiceFeatures};
 use lightning::ln::msgs;
@@ -210,7 +211,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 						let rnid = node_pks.iter().skip(u16::from_be_bytes(get_slice!(2).try_into().unwrap()) as usize % node_pks.len()).next().unwrap();
 						let capacity = u64::from_be_bytes(get_slice!(8).try_into().unwrap());
 						$first_hops_vec.push(ChannelDetails {
-							channel_id: [0; 32],
+							channel_id: ChannelId::new_zero(),
 							counterparty: ChannelCounterparty {
 								node_id: *rnid,
 								features: channelmanager::provided_init_features(&UserConfig::default()),
@@ -232,7 +233,6 @@ 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 +326,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 +365,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)
 				});
 			}
 		}