Skip to content

Commit 5abcf12

Browse files
committed
Rename background-processor test Persister to PersisterSync
1 parent 513dd1b commit 5abcf12

File tree

1 file changed

+23
-19
lines changed
  • lightning-background-processor/src

1 file changed

+23
-19
lines changed

lightning-background-processor/src/lib.rs

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,15 +1384,15 @@ mod tests {
13841384
}
13851385
}
13861386

1387-
struct Persister {
1387+
struct PersisterSync {
13881388
graph_error: Option<(std::io::ErrorKind, &'static str)>,
13891389
graph_persistence_notifier: Option<SyncSender<()>>,
13901390
manager_error: Option<(std::io::ErrorKind, &'static str)>,
13911391
scorer_error: Option<(std::io::ErrorKind, &'static str)>,
13921392
kv_store: FilesystemStore,
13931393
}
13941394

1395-
impl Persister {
1395+
impl PersisterSync {
13961396
fn new(data_dir: PathBuf) -> Self {
13971397
let kv_store = FilesystemStore::new(data_dir);
13981398
Self {
@@ -1421,7 +1421,7 @@ mod tests {
14211421
}
14221422
}
14231423

1424-
impl KVStoreSync for Persister {
1424+
impl KVStoreSync for PersisterSync {
14251425
fn read(
14261426
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
14271427
) -> lightning::io::Result<Vec<u8>> {
@@ -1937,7 +1937,7 @@ mod tests {
19371937

19381938
// Initiate the background processors to watch each node.
19391939
let data_dir = nodes[0].kv_store.get_data_dir();
1940-
let persister = Arc::new(Persister::new(data_dir));
1940+
let persister = Arc::new(PersisterSync::new(data_dir));
19411941
let event_handler = |_: _| Ok(());
19421942
let bg_processor = BackgroundProcessor::start(
19431943
persister,
@@ -2032,7 +2032,7 @@ mod tests {
20322032
// - `OnionMessageHandler::timer_tick_occurred` is called every `ONION_MESSAGE_HANDLER_TIMER`.
20332033
let (_, nodes) = create_nodes(1, "test_timer_tick_called");
20342034
let data_dir = nodes[0].kv_store.get_data_dir();
2035-
let persister = Arc::new(Persister::new(data_dir));
2035+
let persister = Arc::new(PersisterSync::new(data_dir));
20362036
let event_handler = |_: _| Ok(());
20372037
let bg_processor = BackgroundProcessor::start(
20382038
persister,
@@ -2075,7 +2075,7 @@ mod tests {
20752075

20762076
let data_dir = nodes[0].kv_store.get_data_dir();
20772077
let persister = Arc::new(
2078-
Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
2078+
PersisterSync::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
20792079
);
20802080
let event_handler = |_: _| Ok(());
20812081
let bg_processor = BackgroundProcessor::start(
@@ -2108,7 +2108,7 @@ mod tests {
21082108

21092109
let data_dir = nodes[0].kv_store.get_data_dir();
21102110
let persister = Arc::new(
2111-
Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
2111+
PersisterSync::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test"),
21122112
);
21132113

21142114
let bp_future = super::process_events_async(
@@ -2146,8 +2146,9 @@ mod tests {
21462146
// Test that if we encounter an error during network graph persistence, an error gets returned.
21472147
let (_, nodes) = create_nodes(2, "test_persist_network_graph_error");
21482148
let data_dir = nodes[0].kv_store.get_data_dir();
2149-
let persister =
2150-
Arc::new(Persister::new(data_dir).with_graph_error(std::io::ErrorKind::Other, "test"));
2149+
let persister = Arc::new(
2150+
PersisterSync::new(data_dir).with_graph_error(std::io::ErrorKind::Other, "test"),
2151+
);
21512152
let event_handler = |_: _| Ok(());
21522153
let bg_processor = BackgroundProcessor::start(
21532154
persister,
@@ -2177,8 +2178,9 @@ mod tests {
21772178
// Test that if we encounter an error during scorer persistence, an error gets returned.
21782179
let (_, nodes) = create_nodes(2, "test_persist_scorer_error");
21792180
let data_dir = nodes[0].kv_store.get_data_dir();
2180-
let persister =
2181-
Arc::new(Persister::new(data_dir).with_scorer_error(std::io::ErrorKind::Other, "test"));
2181+
let persister = Arc::new(
2182+
PersisterSync::new(data_dir).with_scorer_error(std::io::ErrorKind::Other, "test"),
2183+
);
21822184
let event_handler = |_: _| Ok(());
21832185
let bg_processor = BackgroundProcessor::start(
21842186
persister,
@@ -2211,7 +2213,7 @@ mod tests {
22112213

22122214
let channel_value = 100000;
22132215
let data_dir = nodes[0].kv_store.get_data_dir();
2214-
let persister = Arc::new(Persister::new(data_dir.clone()));
2216+
let persister = Arc::new(PersisterSync::new(data_dir.clone()));
22152217

22162218
// Set up a background event handler for FundingGenerationReady events.
22172219
let (funding_generation_send, funding_generation_recv) = std::sync::mpsc::sync_channel(1);
@@ -2291,7 +2293,7 @@ mod tests {
22912293
}
22922294
Ok(())
22932295
};
2294-
let persister = Arc::new(Persister::new(data_dir));
2296+
let persister = Arc::new(PersisterSync::new(data_dir));
22952297
let bg_processor = BackgroundProcessor::start(
22962298
persister,
22972299
event_handler,
@@ -2437,7 +2439,7 @@ mod tests {
24372439
let (_, nodes) = create_nodes(2, "test_event_handling_failures_are_replayed");
24382440
let channel_value = 100000;
24392441
let data_dir = nodes[0].kv_store.get_data_dir();
2440-
let persister = Arc::new(Persister::new(data_dir.clone()));
2442+
let persister = Arc::new(PersisterSync::new(data_dir.clone()));
24412443

24422444
let (first_event_send, first_event_recv) = std::sync::mpsc::sync_channel(1);
24432445
let (second_event_send, second_event_recv) = std::sync::mpsc::sync_channel(1);
@@ -2486,7 +2488,7 @@ mod tests {
24862488
fn test_scorer_persistence() {
24872489
let (_, nodes) = create_nodes(2, "test_scorer_persistence");
24882490
let data_dir = nodes[0].kv_store.get_data_dir();
2489-
let persister = Arc::new(Persister::new(data_dir));
2491+
let persister = Arc::new(PersisterSync::new(data_dir));
24902492
let event_handler = |_: _| Ok(());
24912493
let bg_processor = BackgroundProcessor::start(
24922494
persister,
@@ -2582,7 +2584,8 @@ mod tests {
25822584
let (_, nodes) =
25832585
create_nodes(2, "test_not_pruning_network_graph_until_graph_sync_completion");
25842586
let data_dir = nodes[0].kv_store.get_data_dir();
2585-
let persister = Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
2587+
let persister =
2588+
Arc::new(PersisterSync::new(data_dir).with_graph_persistence_notifier(sender));
25862589

25872590
let event_handler = |_: _| Ok(());
25882591
let background_processor = BackgroundProcessor::start(
@@ -2615,7 +2618,8 @@ mod tests {
26152618
let (_, nodes) =
26162619
create_nodes(2, "test_not_pruning_network_graph_until_graph_sync_completion_async");
26172620
let data_dir = nodes[0].kv_store.get_data_dir();
2618-
let persister = Arc::new(Persister::new(data_dir).with_graph_persistence_notifier(sender));
2621+
let persister =
2622+
Arc::new(PersisterSync::new(data_dir).with_graph_persistence_notifier(sender));
26192623

26202624
let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
26212625
let bp_future = super::process_events_async(
@@ -2783,7 +2787,7 @@ mod tests {
27832787

27842788
let (_, nodes) = create_nodes(1, "test_payment_path_scoring");
27852789
let data_dir = nodes[0].kv_store.get_data_dir();
2786-
let persister = Arc::new(Persister::new(data_dir));
2790+
let persister = Arc::new(PersisterSync::new(data_dir));
27872791
let bg_processor = BackgroundProcessor::start(
27882792
persister,
27892793
event_handler,
@@ -2831,7 +2835,7 @@ mod tests {
28312835

28322836
let (_, nodes) = create_nodes(1, "test_payment_path_scoring_async");
28332837
let data_dir = nodes[0].kv_store.get_data_dir();
2834-
let persister = Arc::new(Persister::new(data_dir));
2838+
let persister = Arc::new(PersisterSync::new(data_dir));
28352839

28362840
let (exit_sender, exit_receiver) = tokio::sync::watch::channel(());
28372841

0 commit comments

Comments
 (0)