X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=80ea1f1bc73d6932e4ab3db1a2da8904b0f77f14;hb=ce7b0b4ca2fbcc4a9177189a09d031ee2caa8867;hp=671adcfda51ff48d3d1f6f18db8f5cda01426a14;hpb=773c2d1dc3805b4724c72887cf6436ccf088c6a5;p=rust-lightning

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index 671adcfd..80ea1f1b 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -12,18 +12,24 @@ use bitcoin::blockdata::transaction::TxOut;
 use bitcoin::hash_types::BlockHash;
 
 use lightning::chain;
-use lightning::ln::channelmanager::ChannelDetails;
+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, RouteHint};
+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};
 
-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 std::convert::TryInto;
 use std::collections::HashSet;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -128,7 +134,8 @@ pub fn do_test<Out: test_logger::Output>(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,
 				}
 			}
 		}}
@@ -155,7 +162,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
 
 	let our_pubkey = get_pubkey!();
-	let mut net_graph = NetworkGraph::new();
+	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash());
 
 	let mut node_pks = HashSet::new();
 	let mut scid = 42;
@@ -199,29 +206,47 @@ pub fn do_test<Out: test_logger::Output>(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: 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),
-								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,
+								force_close_spend_delay: None,
+								is_outbound: true, is_funding_locked: 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,
 							});
 						}
 						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 {
@@ -229,16 +254,22 @@ pub fn do_test<Out: test_logger::Output>(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::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
-						&last_hops.iter().collect::<Vec<_>>(),
-						slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger));
+						Arc::clone(&logger), &scorer, &random_seed_bytes);
 				}
 			},
 		}