X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=3e51d0c6a6d37fb4fdd0aa3df8f55987f2fa55be;hb=acd2ae606d9c703e9f9a47ff774700337fe26a86;hp=55f08b628977daa2bd4611387877d5713d1d668d;hpb=879e309c128e2e2980846bfbb9a80a4c2bf8cbb4;p=rust-lightning diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs index 55f08b62..3e51d0c6 100644 --- a/fuzz/src/router.rs +++ b/fuzz/src/router.rs @@ -12,21 +12,24 @@ use bitcoin::blockdata::transaction::TxOut; use bitcoin::hash_types::BlockHash; use lightning::chain; -use lightning::ln::channelmanager::ChannelDetails; -use lightning::ln::features::InitFeatures; +use lightning::chain::transaction::OutPoint; +use lightning::ln::channelmanager::{self, ChannelDetails, ChannelCounterparty}; use lightning::ln::msgs; -use lightning::routing::router::{get_route, RouteHint}; -use lightning::util::logger::Logger; +use lightning::routing::gossip::{NetworkGraph, RoutingFees}; +use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters}; +use lightning::routing::scoring::FixedPenaltyScorer; +use lightning::util::config::UserConfig; use lightning::util::ser::Readable; -use lightning::routing::network_graph::{NetworkGraph, RoutingFees}; -use bitcoin::secp256k1::key::PublicKey; +use bitcoin::hashes::Hash; +use bitcoin::secp256k1::PublicKey; use bitcoin::network::constants::Network; use bitcoin::blockdata::constants::genesis_block; -use utils::test_logger; +use crate::utils::test_logger; -use std::collections::HashSet; +use std::convert::TryInto; +use hashbrown::HashSet; use std::sync::Arc; use std::sync::atomic::{AtomicUsize, Ordering}; @@ -130,7 +133,8 @@ pub fn do_test(data: &[u8], out: Out) { msgs::DecodeError::InvalidValue => return, msgs::DecodeError::BadLengthDescriptor => return, msgs::DecodeError::ShortRead => panic!("We picked the length..."), - msgs::DecodeError::Io(e) => panic!(format!("{:?}", e)), + msgs::DecodeError::Io(e) => panic!("{:?}", e), + msgs::DecodeError::UnsupportedCompression => return, } } }} @@ -154,10 +158,10 @@ pub fn do_test(data: &[u8], out: Out) { } } - let logger: Arc = Arc::new(test_logger::TestLogger::new("".to_owned(), out)); + let logger = test_logger::TestLogger::new("".to_owned(), out); let our_pubkey = get_pubkey!(); - let mut net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash()); + let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger); let mut node_pks = HashSet::new(); let mut scid = 42; @@ -191,7 +195,7 @@ pub fn do_test(data: &[u8], out: Out) { }, 4 => { let short_channel_id = slice_to_be64(get_slice!(8)); - net_graph.close_channel_from_update(short_channel_id, false); + net_graph.channel_failed(short_channel_id, false); }, _ if node_pks.is_empty() => {}, _ => { @@ -201,29 +205,49 @@ pub fn do_test(data: &[u8], out: Out) { count => { for _ in 0..count { scid += 1; - let rnid = node_pks.iter().skip(slice_to_be16(get_slice!(2))as usize % node_pks.len()).next().unwrap(); + 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], + counterparty: ChannelCounterparty { + node_id: *rnid, + features: channelmanager::provided_init_features(&UserConfig::default()), + 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), - remote_network_id: *rnid, - counterparty_features: InitFeatures::known(), - channel_value_satoshis: slice_to_be64(get_slice!(8)), - user_id: 0, - inbound_capacity_msat: 0, - is_live: true, - outbound_capacity_msat: 0, + inbound_scid_alias: None, + outbound_scid_alias: None, + channel_value_satoshis: capacity, + user_channel_id: 0, inbound_capacity_msat: 0, + unspendable_punishment_reserve: None, + confirmations_required: None, + confirmations: None, + 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), + inbound_htlc_minimum_msat: None, + inbound_htlc_maximum_msat: None, + config: None, }); } Some(&first_hops_vec[..]) }, }; - let mut last_hops_vec = Vec::new(); + let mut last_hops = Vec::new(); { let count = get_slice!(1)[0]; for _ in 0..count { scid += 1; let rnid = node_pks.iter().skip(slice_to_be16(get_slice!(2))as usize % node_pks.len()).next().unwrap(); - last_hops_vec.push(RouteHint { + last_hops.push(RouteHint(vec![RouteHintHop { src_node_id: *rnid, short_channel_id: scid, fees: RoutingFees { @@ -231,16 +255,22 @@ pub fn do_test(data: &[u8], out: Out) { proportional_millionths: slice_to_be32(get_slice!(4)), }, cltv_expiry_delta: slice_to_be16(get_slice!(2)), - htlc_minimum_msat: slice_to_be64(get_slice!(8)), - }); + htlc_minimum_msat: Some(slice_to_be64(get_slice!(8))), + htlc_maximum_msat: None, + }])); } } - let last_hops = &last_hops_vec[..]; + let scorer = FixedPenaltyScorer::with_penalty(0); + let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32]; for target in node_pks.iter() { - let _ = get_route(&our_pubkey, &net_graph, target, + 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()), - &last_hops.iter().collect::>(), - slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger)); + &logger, &scorer, &random_seed_bytes); } }, }