Skip to content

Commit 1ffe2a7

Browse files
committed
Drop redundant FilesystemStore initialization
1 parent 95c11d0 commit 1ffe2a7

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

src/main.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,13 +1034,10 @@ async fn start_ldk() {
10341034
}
10351035
};
10361036

1037-
// Step 21: Persist ChannelManager and NetworkGraph
1038-
let persister = Arc::new(FilesystemStore::new(ldk_data_dir.clone().into()));
1039-
1040-
// Step 22: Background Processing
1037+
// Step 21: Background Processing
10411038
let (bp_exit, bp_exit_check) = tokio::sync::watch::channel(());
10421039
let mut background_processor = tokio::spawn(process_events_async(
1043-
Arc::clone(&persister),
1040+
Arc::clone(&fs_store),
10441041
event_handler,
10451042
Arc::clone(&chain_monitor),
10461043
Arc::clone(&channel_manager),
@@ -1143,14 +1140,14 @@ async fn start_ldk() {
11431140
ldk_data_dir.clone(),
11441141
Arc::clone(&keys_manager),
11451142
Arc::clone(&logger),
1146-
Arc::clone(&persister),
1143+
Arc::clone(&fs_store),
11471144
Arc::clone(&output_sweeper),
11481145
));
11491146

11501147
// Start the CLI.
11511148
let cli_channel_manager = Arc::clone(&channel_manager);
11521149
let cli_chain_monitor = Arc::clone(&chain_monitor);
1153-
let cli_persister = Arc::clone(&persister);
1150+
let cli_fs_store = Arc::clone(&fs_store);
11541151
let cli_peer_manager = Arc::clone(&peer_manager);
11551152
let cli_poll = tokio::task::spawn(
11561153
cli::poll_for_user_input(
@@ -1161,7 +1158,7 @@ async fn start_ldk() {
11611158
network_graph,
11621159
inbound_payments,
11631160
outbound_payments,
1164-
cli_persister,
1161+
cli_fs_store,
11651162
)
11661163
);
11671164

@@ -1181,7 +1178,7 @@ async fn start_ldk() {
11811178
peer_manager.disconnect_all_peers();
11821179

11831180
if let Err(e) = bg_res {
1184-
let persist_res = persister
1181+
let persist_res = fs_store
11851182
.write(
11861183
persist::CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
11871184
persist::CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,

0 commit comments

Comments
 (0)