Skip to content

Commit 7c8461b

Browse files
committed
Drop redundant FilesystemStore initialization
1 parent 6df8846 commit 7c8461b

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/main.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,13 +1027,10 @@ async fn start_ldk() {
10271027
}
10281028
};
10291029

1030-
// Step 21: Persist ChannelManager and NetworkGraph
1031-
let persister = Arc::new(FilesystemStore::new(ldk_data_dir.clone().into()));
1032-
1033-
// Step 22: Background Processing
1030+
// Step 21: Background Processing
10341031
let (bp_exit, bp_exit_check) = tokio::sync::watch::channel(());
10351032
let mut background_processor = tokio::spawn(process_events_async(
1036-
Arc::clone(&persister),
1033+
Arc::clone(&fs_store),
10371034
event_handler,
10381035
Arc::clone(&chain_monitor),
10391036
Arc::clone(&channel_manager),
@@ -1133,14 +1130,14 @@ async fn start_ldk() {
11331130
ldk_data_dir.clone(),
11341131
Arc::clone(&keys_manager),
11351132
Arc::clone(&logger),
1136-
Arc::clone(&persister),
1133+
Arc::clone(&fs_store),
11371134
Arc::clone(&output_sweeper),
11381135
));
11391136

11401137
// Start the CLI.
11411138
let cli_channel_manager = Arc::clone(&channel_manager);
11421139
let cli_chain_monitor = Arc::clone(&chain_monitor);
1143-
let cli_persister = Arc::clone(&persister);
1140+
let cli_fs_store = Arc::clone(&fs_store);
11441141
let cli_peer_manager = Arc::clone(&peer_manager);
11451142
let cli_poll = tokio::task::spawn(
11461143
cli::poll_for_user_input(
@@ -1151,7 +1148,7 @@ async fn start_ldk() {
11511148
network_graph,
11521149
inbound_payments,
11531150
outbound_payments,
1154-
cli_persister,
1151+
cli_fs_store,
11551152
)
11561153
);
11571154

@@ -1171,7 +1168,7 @@ async fn start_ldk() {
11711168
peer_manager.disconnect_all_peers();
11721169

11731170
if let Err(e) = bg_res {
1174-
let persist_res = persister
1171+
let persist_res = fs_store
11751172
.write(
11761173
persist::CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
11771174
persist::CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,

0 commit comments

Comments
 (0)