Skip to content

Commit 87904ae

Browse files
committed
Drop redundant FilesystemStore initialization
1 parent f190e8a commit 87904ae

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
@@ -1035,13 +1035,10 @@ async fn start_ldk() {
10351035
}
10361036
};
10371037

1038-
// Step 21: Persist ChannelManager and NetworkGraph
1039-
let persister = Arc::new(FilesystemStore::new(ldk_data_dir.clone().into()));
1040-
1041-
// Step 22: Background Processing
1038+
// Step 21: Background Processing
10421039
let (bp_exit, bp_exit_check) = tokio::sync::watch::channel(());
10431040
let mut background_processor = tokio::spawn(process_events_async(
1044-
Arc::clone(&persister),
1041+
Arc::clone(&fs_store),
10451042
event_handler,
10461043
Arc::clone(&chain_monitor),
10471044
Arc::clone(&channel_manager),
@@ -1144,14 +1141,14 @@ async fn start_ldk() {
11441141
ldk_data_dir.clone(),
11451142
Arc::clone(&keys_manager),
11461143
Arc::clone(&logger),
1147-
Arc::clone(&persister),
1144+
Arc::clone(&fs_store),
11481145
Arc::clone(&output_sweeper),
11491146
));
11501147

11511148
// Start the CLI.
11521149
let cli_channel_manager = Arc::clone(&channel_manager);
11531150
let cli_chain_monitor = Arc::clone(&chain_monitor);
1154-
let cli_persister = Arc::clone(&persister);
1151+
let cli_fs_store = Arc::clone(&fs_store);
11551152
let cli_peer_manager = Arc::clone(&peer_manager);
11561153
let cli_poll = tokio::task::spawn(
11571154
cli::poll_for_user_input(
@@ -1162,7 +1159,7 @@ async fn start_ldk() {
11621159
network_graph,
11631160
inbound_payments,
11641161
outbound_payments,
1165-
cli_persister,
1162+
cli_fs_store,
11661163
)
11671164
);
11681165

@@ -1182,7 +1179,7 @@ async fn start_ldk() {
11821179
peer_manager.disconnect_all_peers();
11831180

11841181
if let Err(e) = bg_res {
1185-
let persist_res = persister
1182+
let persist_res = fs_store
11861183
.write(
11871184
persist::CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
11881185
persist::CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,

0 commit comments

Comments
 (0)