@@ -1384,15 +1384,15 @@ mod tests {
1384
1384
}
1385
1385
}
1386
1386
1387
- struct Persister {
1387
+ struct PersisterSync {
1388
1388
graph_error : Option < ( std:: io:: ErrorKind , & ' static str ) > ,
1389
1389
graph_persistence_notifier : Option < SyncSender < ( ) > > ,
1390
1390
manager_error : Option < ( std:: io:: ErrorKind , & ' static str ) > ,
1391
1391
scorer_error : Option < ( std:: io:: ErrorKind , & ' static str ) > ,
1392
1392
kv_store : FilesystemStore ,
1393
1393
}
1394
1394
1395
- impl Persister {
1395
+ impl PersisterSync {
1396
1396
fn new ( data_dir : PathBuf ) -> Self {
1397
1397
let kv_store = FilesystemStore :: new ( data_dir) ;
1398
1398
Self {
@@ -1421,7 +1421,7 @@ mod tests {
1421
1421
}
1422
1422
}
1423
1423
1424
- impl KVStoreSync for Persister {
1424
+ impl KVStoreSync for PersisterSync {
1425
1425
fn read (
1426
1426
& self , primary_namespace : & str , secondary_namespace : & str , key : & str ,
1427
1427
) -> lightning:: io:: Result < Vec < u8 > > {
@@ -1937,7 +1937,7 @@ mod tests {
1937
1937
1938
1938
// Initiate the background processors to watch each node.
1939
1939
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) ) ;
1941
1941
let event_handler = |_: _ | Ok ( ( ) ) ;
1942
1942
let bg_processor = BackgroundProcessor :: start (
1943
1943
persister,
@@ -2032,7 +2032,7 @@ mod tests {
2032
2032
// - `OnionMessageHandler::timer_tick_occurred` is called every `ONION_MESSAGE_HANDLER_TIMER`.
2033
2033
let ( _, nodes) = create_nodes ( 1 , "test_timer_tick_called" ) ;
2034
2034
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) ) ;
2036
2036
let event_handler = |_: _ | Ok ( ( ) ) ;
2037
2037
let bg_processor = BackgroundProcessor :: start (
2038
2038
persister,
@@ -2075,7 +2075,7 @@ mod tests {
2075
2075
2076
2076
let data_dir = nodes[ 0 ] . kv_store . get_data_dir ( ) ;
2077
2077
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" ) ,
2079
2079
) ;
2080
2080
let event_handler = |_: _ | Ok ( ( ) ) ;
2081
2081
let bg_processor = BackgroundProcessor :: start (
@@ -2108,7 +2108,7 @@ mod tests {
2108
2108
2109
2109
let data_dir = nodes[ 0 ] . kv_store . get_data_dir ( ) ;
2110
2110
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" ) ,
2112
2112
) ;
2113
2113
2114
2114
let bp_future = super :: process_events_async (
@@ -2146,8 +2146,9 @@ mod tests {
2146
2146
// Test that if we encounter an error during network graph persistence, an error gets returned.
2147
2147
let ( _, nodes) = create_nodes ( 2 , "test_persist_network_graph_error" ) ;
2148
2148
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
+ ) ;
2151
2152
let event_handler = |_: _ | Ok ( ( ) ) ;
2152
2153
let bg_processor = BackgroundProcessor :: start (
2153
2154
persister,
@@ -2177,8 +2178,9 @@ mod tests {
2177
2178
// Test that if we encounter an error during scorer persistence, an error gets returned.
2178
2179
let ( _, nodes) = create_nodes ( 2 , "test_persist_scorer_error" ) ;
2179
2180
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
+ ) ;
2182
2184
let event_handler = |_: _ | Ok ( ( ) ) ;
2183
2185
let bg_processor = BackgroundProcessor :: start (
2184
2186
persister,
@@ -2211,7 +2213,7 @@ mod tests {
2211
2213
2212
2214
let channel_value = 100000 ;
2213
2215
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 ( ) ) ) ;
2215
2217
2216
2218
// Set up a background event handler for FundingGenerationReady events.
2217
2219
let ( funding_generation_send, funding_generation_recv) = std:: sync:: mpsc:: sync_channel ( 1 ) ;
@@ -2291,7 +2293,7 @@ mod tests {
2291
2293
}
2292
2294
Ok ( ( ) )
2293
2295
} ;
2294
- let persister = Arc :: new ( Persister :: new ( data_dir) ) ;
2296
+ let persister = Arc :: new ( PersisterSync :: new ( data_dir) ) ;
2295
2297
let bg_processor = BackgroundProcessor :: start (
2296
2298
persister,
2297
2299
event_handler,
@@ -2437,7 +2439,7 @@ mod tests {
2437
2439
let ( _, nodes) = create_nodes ( 2 , "test_event_handling_failures_are_replayed" ) ;
2438
2440
let channel_value = 100000 ;
2439
2441
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 ( ) ) ) ;
2441
2443
2442
2444
let ( first_event_send, first_event_recv) = std:: sync:: mpsc:: sync_channel ( 1 ) ;
2443
2445
let ( second_event_send, second_event_recv) = std:: sync:: mpsc:: sync_channel ( 1 ) ;
@@ -2486,7 +2488,7 @@ mod tests {
2486
2488
fn test_scorer_persistence ( ) {
2487
2489
let ( _, nodes) = create_nodes ( 2 , "test_scorer_persistence" ) ;
2488
2490
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) ) ;
2490
2492
let event_handler = |_: _ | Ok ( ( ) ) ;
2491
2493
let bg_processor = BackgroundProcessor :: start (
2492
2494
persister,
@@ -2582,7 +2584,8 @@ mod tests {
2582
2584
let ( _, nodes) =
2583
2585
create_nodes ( 2 , "test_not_pruning_network_graph_until_graph_sync_completion" ) ;
2584
2586
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) ) ;
2586
2589
2587
2590
let event_handler = |_: _ | Ok ( ( ) ) ;
2588
2591
let background_processor = BackgroundProcessor :: start (
@@ -2615,7 +2618,8 @@ mod tests {
2615
2618
let ( _, nodes) =
2616
2619
create_nodes ( 2 , "test_not_pruning_network_graph_until_graph_sync_completion_async" ) ;
2617
2620
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) ) ;
2619
2623
2620
2624
let ( exit_sender, exit_receiver) = tokio:: sync:: watch:: channel ( ( ) ) ;
2621
2625
let bp_future = super :: process_events_async (
@@ -2783,7 +2787,7 @@ mod tests {
2783
2787
2784
2788
let ( _, nodes) = create_nodes ( 1 , "test_payment_path_scoring" ) ;
2785
2789
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) ) ;
2787
2791
let bg_processor = BackgroundProcessor :: start (
2788
2792
persister,
2789
2793
event_handler,
@@ -2831,7 +2835,7 @@ mod tests {
2831
2835
2832
2836
let ( _, nodes) = create_nodes ( 1 , "test_payment_path_scoring_async" ) ;
2833
2837
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) ) ;
2835
2839
2836
2840
let ( exit_sender, exit_receiver) = tokio:: sync:: watch:: channel ( ( ) ) ;
2837
2841
0 commit comments