Skip to content

Commit 60c6783

Browse files
committed
Use Default::default() to construct () as score-updating param
In 6b0d94a we switched most tests to `Default::default()` for scoring parameters passed to route-fetching. Here we do the same for the scoring parameters when passed to score-updating.
1 parent ce74634 commit 60c6783

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lightning-background-processor/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ mod tests {
11781178
let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
11791179
let scorer = Arc::new(Mutex::new(TestScorer::new()));
11801180
let seed = [i as u8; 32];
1181-
let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), ()));
1181+
let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone(), Default::default()));
11821182
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
11831183
let kv_store = Arc::new(FilesystemStore::new(format!("{}_persister_{}", &persist_dir, i).into()));
11841184
let now = Duration::from_secs(genesis_block.header.time as u64);

lightning/src/util/test_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ impl<'a> Router for TestRouter<'a> {
139139
// Since the path is reversed, the last element in our iteration is the first
140140
// hop.
141141
if idx == path.hops.len() - 1 {
142-
scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(payer), &NodeId::from_pubkey(&hop.pubkey), usage, &());
142+
scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(payer), &NodeId::from_pubkey(&hop.pubkey), usage, &Default::default());
143143
} else {
144144
let curr_hop_path_idx = path.hops.len() - 1 - idx;
145-
scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(&path.hops[curr_hop_path_idx - 1].pubkey), &NodeId::from_pubkey(&hop.pubkey), usage, &());
145+
scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(&path.hops[curr_hop_path_idx - 1].pubkey), &NodeId::from_pubkey(&hop.pubkey), usage, &Default::default());
146146
}
147147
}
148148
}
@@ -152,7 +152,7 @@ impl<'a> Router for TestRouter<'a> {
152152
let logger = TestLogger::new();
153153
find_route(
154154
payer, params, &self.network_graph, first_hops, &logger,
155-
&ScorerAccountingForInFlightHtlcs::new(self.scorer.read().unwrap(), &inflight_htlcs), &(),
155+
&ScorerAccountingForInFlightHtlcs::new(self.scorer.read().unwrap(), &inflight_htlcs), &Default::default(),
156156
&[42; 32]
157157
)
158158
}

0 commit comments

Comments
 (0)