Merge pull request #1543 from jkczyz/2022-06-network-graph-bindings

[rust-lightning] / fuzz / src / router.rs

diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs
index 84afb91f952263fbd39566da37cf8bef17a9d7cc..9a11935cad6d1fdcee64a5d983211be802d7ae3e 100644 (file)
--- a/fuzz/src/router.rs
+++ b/fuzz/src/router.rs
@@ -19,7 +19,6 @@ 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 +158,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;
@@ -268,9 +267,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);
                                }
                        },
                }