X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=fuzz%2Fsrc%2Frouter.rs;h=efa244d9bf5cb6eb4715730fff3f2baca5f9f2f7;hb=35d4ebb208255724804187e3f10553c9383c9522;hp=6f54aa02df79ce5e0afa9ce02e795861e4a6c59d;hpb=b5be4c210c804488c18a0f5fe912728fdede6984;p=rust-lightning diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs index 6f54aa02..efa244d9 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::{get_route, Payee, RouteHint, RouteHintHop}; -use lightning::routing::scorer::Scorer; +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}; @@ -223,6 +223,7 @@ pub fn do_test(data: &[u8], out: Out) { 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, }); } @@ -248,12 +249,16 @@ pub fn do_test(data: &[u8], out: Out) { }])); } } - let scorer = Scorer::new(0); + let scorer = Scorer::with_fixed_penalty(0); for target in node_pks.iter() { - let payee = Payee::new(*target).with_route_hints(last_hops.clone()); - let _ = get_route(&our_pubkey, &payee, &net_graph, + 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::>()).as_ref().map(|a| a.as_slice()), - slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer); + Arc::clone(&logger), &scorer); } }, }