X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=b0f052dbc646f613a1d8c038c88c96c3604ef88e;hb=63f0a31b597b32253c886d8e10115bd09f948e14;hp=d6aa97e42e7fc3939c327501017080b03e2552cb;hpb=54114c9d858fba00d0885d06419f4650629bf6c7;p=rust-lightning diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs index d6aa97e4..b0f052db 100644 --- a/fuzz/src/router.rs +++ b/fuzz/src/router.rs @@ -16,8 +16,8 @@ use lightning::chain::transaction::OutPoint; use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty}; use lightning::ln::features::InitFeatures; use lightning::ln::msgs; -use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters}; -use lightning::routing::scoring::Scorer; +use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters}; +use lightning::routing::scoring::FixedPenaltyScorer; use lightning::util::logger::Logger; use lightning::util::ser::Readable; use lightning::routing::network_graph::{NetworkGraph, RoutingFees}; @@ -213,9 +213,13 @@ pub fn do_test(data: &[u8], out: Out) { features: InitFeatures::known(), unspendable_punishment_reserve: 0, forwarding_info: None, + outbound_htlc_minimum_msat: None, + outbound_htlc_maximum_msat: None, }, funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }), + channel_type: None, short_channel_id: Some(scid), + inbound_scid_alias: None, channel_value_satoshis: slice_to_be64(get_slice!(8)), user_channel_id: 0, inbound_capacity_msat: 0, unspendable_punishment_reserve: None, @@ -225,6 +229,8 @@ pub fn do_test(data: &[u8], out: Out) { is_usable: true, is_public: true, balance_msat: 0, outbound_capacity_msat: 0, + inbound_htlc_minimum_msat: None, + inbound_htlc_maximum_msat: None, }); } Some(&first_hops_vec[..]) @@ -249,16 +255,17 @@ pub fn do_test(data: &[u8], out: Out) { }])); } } - let scorer = Scorer::with_fixed_penalty(0); + let scorer = FixedPenaltyScorer::with_penalty(0); + let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32]; for target in node_pks.iter() { - let params = RouteParameters { - payee: Payee::from_node_id(*target).with_route_hints(last_hops.clone()), + 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, ¶ms, &net_graph, + let _ = find_route(&our_pubkey, &route_params, &net_graph, first_hops.map(|c| c.iter().collect::>()).as_ref().map(|a| a.as_slice()), - Arc::clone(&logger), &scorer); + Arc::clone(&logger), &scorer, &random_seed_bytes); } }, }