Skip to content

Commit c180ddd

Browse files
authored
Merge pull request #1541 from jkczyz/2022-06-nit-follow-ups
2 parents 8fce6a1 + 1aa1d69 commit c180ddd

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

fuzz/src/process_network_graph.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use std::sync::Arc;
99
/// Actual fuzz test, method signature and name are fixed
1010
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
1111
let block_hash = bitcoin::BlockHash::default();
12-
let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
13-
let network_graph = lightning::routing::gossip::NetworkGraph::new(block_hash, logger);
12+
let logger = test_logger::TestLogger::new("".to_owned(), out);
13+
let network_graph = lightning::routing::gossip::NetworkGraph::new(block_hash, &logger);
1414
let rapid_sync = RapidGossipSync::new(&network_graph);
1515
let _ = rapid_sync.update_network_graph(data);
1616
}

fuzz/src/router.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
159159
}
160160
}
161161

162-
let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
162+
let logger = test_logger::TestLogger::new("".to_owned(), out);
163163

164164
let our_pubkey = get_pubkey!();
165-
let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), Arc::clone(&logger));
165+
let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
166166

167167
let mut node_pks = HashSet::new();
168168
let mut scid = 42;
@@ -269,7 +269,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
269269
};
270270
let _ = find_route(&our_pubkey, &route_params, &net_graph.read_only(),
271271
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
272-
Arc::clone(&logger), &scorer, &random_seed_bytes);
272+
&logger, &scorer, &random_seed_bytes);
273273
}
274274
},
275275
}

lightning-background-processor/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ impl BackgroundProcessor {
202202
///
203203
/// # Rapid Gossip Sync
204204
///
205-
/// If rapid gossip sync is meant to run at startup, pass a [`RapidGossipSync`] to `gossip_sync`
205+
/// If rapid gossip sync is meant to run at startup, pass [`RapidGossipSync`] via `gossip_sync`
206206
/// to indicate that the [`BackgroundProcessor`] should not prune the [`NetworkGraph`] instance
207207
/// until the [`RapidGossipSync`] instance completes its first sync.
208208
///

lightning/src/routing/gossip.rs

+13-14
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ where C::Target: chain::Access, L::Target: Logger
250250

251251
impl<L: Deref> EventHandler for NetworkGraph<L> where L::Target: Logger {
252252
fn handle_event(&self, event: &Event) {
253-
if let Event::PaymentPathFailed { payment_hash: _, rejected_by_dest: _, network_update, .. } = event {
253+
if let Event::PaymentPathFailed { network_update, .. } = event {
254254
if let Some(network_update) = network_update {
255255
match *network_update {
256256
NetworkUpdate::ChannelUpdateMessage { ref msg } => {
@@ -1632,7 +1632,6 @@ mod tests {
16321632
UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate,
16331633
ReplyChannelRange, QueryChannelRange, QueryShortChannelIds, MAX_VALUE_MSAT};
16341634
use util::test_utils;
1635-
use util::logger::Logger;
16361635
use util::ser::{ReadableArgs, Writeable};
16371636
use util::events::{Event, EventHandler, MessageSendEvent, MessageSendEventsProvider};
16381637
use util::scid_utils::scid_from_parts;
@@ -1829,7 +1828,7 @@ mod tests {
18291828
#[test]
18301829
fn handling_channel_announcements() {
18311830
let secp_ctx = Secp256k1::new();
1832-
let logger: Arc<Logger> = Arc::new(test_utils::TestLogger::new());
1831+
let logger = test_utils::TestLogger::new();
18331832

18341833
let node_1_privkey = &SecretKey::from_slice(&[42; 32]).unwrap();
18351834
let node_2_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
@@ -1839,8 +1838,8 @@ mod tests {
18391838

18401839
// Test if the UTXO lookups were not supported
18411840
let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
1842-
let network_graph = NetworkGraph::new(genesis_hash, Arc::clone(&logger));
1843-
let mut gossip_sync = P2PGossipSync::new(&network_graph, None, Arc::clone(&logger));
1841+
let network_graph = NetworkGraph::new(genesis_hash, &logger);
1842+
let mut gossip_sync = P2PGossipSync::new(&network_graph, None, &logger);
18441843
match gossip_sync.handle_channel_announcement(&valid_announcement) {
18451844
Ok(res) => assert!(res),
18461845
_ => panic!()
@@ -1861,10 +1860,10 @@ mod tests {
18611860
};
18621861

18631862
// Test if an associated transaction were not on-chain (or not confirmed).
1864-
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
1863+
let chain_source = test_utils::TestChainSource::new(Network::Testnet);
18651864
*chain_source.utxo_ret.lock().unwrap() = Err(chain::AccessError::UnknownTx);
1866-
let network_graph = NetworkGraph::new(genesis_hash, Arc::clone(&logger));
1867-
gossip_sync = P2PGossipSync::new(&network_graph, Some(chain_source.clone()), Arc::clone(&logger));
1865+
let network_graph = NetworkGraph::new(genesis_hash, &logger);
1866+
gossip_sync = P2PGossipSync::new(&network_graph, Some(&chain_source), &logger);
18681867

18691868
let valid_announcement = get_signed_channel_announcement(|unsigned_announcement| {
18701869
unsigned_announcement.short_channel_id += 1;
@@ -1945,11 +1944,11 @@ mod tests {
19451944
#[test]
19461945
fn handling_channel_update() {
19471946
let secp_ctx = Secp256k1::new();
1948-
let logger: Arc<Logger> = Arc::new(test_utils::TestLogger::new());
1949-
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
1947+
let logger = test_utils::TestLogger::new();
1948+
let chain_source = test_utils::TestChainSource::new(Network::Testnet);
19501949
let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
1951-
let network_graph = NetworkGraph::new(genesis_hash, Arc::clone(&logger));
1952-
let gossip_sync = P2PGossipSync::new(&network_graph, Some(chain_source.clone()), Arc::clone(&logger));
1950+
let network_graph = NetworkGraph::new(genesis_hash, &logger);
1951+
let gossip_sync = P2PGossipSync::new(&network_graph, Some(&chain_source), &logger);
19531952

19541953
let node_1_privkey = &SecretKey::from_slice(&[42; 32]).unwrap();
19551954
let node_2_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
@@ -2151,10 +2150,10 @@ mod tests {
21512150
fn test_channel_timeouts() {
21522151
// Test the removal of channels with `remove_stale_channels`.
21532152
let logger = test_utils::TestLogger::new();
2154-
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
2153+
let chain_source = test_utils::TestChainSource::new(Network::Testnet);
21552154
let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
21562155
let network_graph = NetworkGraph::new(genesis_hash, &logger);
2157-
let gossip_sync = P2PGossipSync::new(&network_graph, Some(chain_source.clone()), &logger);
2156+
let gossip_sync = P2PGossipSync::new(&network_graph, Some(&chain_source), &logger);
21582157
let secp_ctx = Secp256k1::new();
21592158

21602159
let node_1_privkey = &SecretKey::from_slice(&[42; 32]).unwrap();

0 commit comments

Comments
 (0)