X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=f9a263cc3254556036bc4640d07f40a9df6179d4;hb=62f466a0a2370b9f9696e05d3ce651216d7410d9;hp=44c0b209c2cdd0d9cebcb9e413d1a7e763a3f519;hpb=c9321c5ec07ee2daa895b5136e9472a42d4eff1d;p=rust-lightning

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index 44c0b209..f9a263cc 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -12,14 +12,16 @@ use bitcoin::blockdata::transaction::TxOut;
 use bitcoin::hash_types::BlockHash;
 
 use lightning::chain;
+use lightning::chain::transaction::OutPoint;
 use lightning::ln::channelmanager::ChannelDetails;
 use lightning::ln::features::InitFeatures;
 use lightning::ln::msgs;
-use lightning::routing::router::{get_route, RouteHint};
+use lightning::routing::router::{get_route, RouteHintHop};
 use lightning::util::logger::Logger;
 use lightning::util::ser::Readable;
 use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
 
+use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::key::PublicKey;
 use bitcoin::network::constants::Network;
 use bitcoin::blockdata::constants::genesis_block;
@@ -130,7 +132,7 @@ 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),
 				}
 			}
 		}}
@@ -204,14 +206,19 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 							let rnid = node_pks.iter().skip(slice_to_be16(get_slice!(2))as usize % node_pks.len()).next().unwrap();
 							first_hops_vec.push(ChannelDetails {
 								channel_id: [0; 32],
+								funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 								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,
+								is_outbound: true,
+								is_funding_locked: true,
+								is_usable: true,
+								is_public: true,
 								outbound_capacity_msat: 0,
+								counterparty_forwarding_info: None,
 							});
 						}
 						Some(&first_hops_vec[..])
@@ -223,7 +230,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 					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_vec.push(RouteHintHop {
 							src_node_id: *rnid,
 							short_channel_id: scid,
 							fees: RoutingFees {