X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Frouter.rs;h=2539822cea2f62bccdef31902c60efeef1448fd8;hb=12fa0b11a669050bc3e0e081bea0523baa1598ff;hp=21fb2dc152a5fa9aa72f0b79dbca24ef63fad2a3;hpb=6e00c28a55006be93e26b145d8670c594144c785;p=rust-lightning

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index 21fb2dc1..2539822c 100644
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -13,13 +13,11 @@ use bitcoin::hash_types::BlockHash;
 
 use lightning::chain;
 use lightning::chain::transaction::OutPoint;
-use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
-use lightning::ln::features::InitFeatures;
+use lightning::ln::channelmanager::{self, ChannelDetails, ChannelCounterparty};
 use lightning::ln::msgs;
 use lightning::routing::gossip::{NetworkGraph, RoutingFees};
 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 bitcoin::hashes::Hash;
@@ -159,10 +157,10 @@ 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 logger = test_logger::TestLogger::new("".to_owned(), out);
 
 	let our_pubkey = get_pubkey!();
-	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), Arc::clone(&logger));
+	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
 
 	let mut node_pks = HashSet::new();
 	let mut scid = 42;
@@ -212,7 +210,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 								channel_id: [0; 32],
 								counterparty: ChannelCounterparty {
 									node_id: *rnid,
-									features: InitFeatures::known(),
+									features: channelmanager::provided_init_features(),
 									unspendable_punishment_reserve: 0,
 									forwarding_info: None,
 									outbound_htlc_minimum_msat: None,
@@ -235,6 +233,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 								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[..])
@@ -267,9 +266,9 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 						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.read_only(),
+					let _ = find_route(&our_pubkey, &route_params, &net_graph,
 						first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
-						Arc::clone(&logger), &scorer, &random_seed_bytes);
+						&logger, &scorer, &random_seed_bytes);
 				}
 			},
 		}