Merge pull request #117 from TheBlueMatt/main

Sweep Fixes

diff --git a/src/cli.rs b/src/cli.rs
index 10dce9283657345c110cbb47d1e4b85a576e5627..75b79673a11ba8aa342275c78b0042d0a97073f1 100644 (file)
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -60,7 +60,7 @@ impl Writeable for UserOnionMessageContents {
        }
 }
 
-pub(crate) async fn poll_for_user_input(
+pub(crate) fn poll_for_user_input(
        peer_manager: Arc<PeerManager>, channel_manager: Arc<ChannelManager>,
        keys_manager: Arc<KeysManager>, network_graph: Arc<NetworkGraph>,
        onion_messenger: Arc<OnionMessenger>, inbound_payments: Arc<Mutex<PaymentInfoStorage>>,
@@ -112,8 +112,12 @@ pub(crate) async fn poll_for_user_input(
                                                continue;
                                        }
 
-                                       if connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone())
-                                               .await
+                                       if tokio::runtime::Handle::current()
+                                               .block_on(connect_peer_if_necessary(
+                                                       pubkey,
+                                                       peer_addr,
+                                                       peer_manager.clone(),
+                                               ))
                                                .is_err()
                                        {
                                                continue;
@@ -259,8 +263,12 @@ pub(crate) async fn poll_for_user_input(
                                                                continue;
                                                        }
                                                };
-                                       if connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone())
-                                               .await
+                                       if tokio::runtime::Handle::current()
+                                               .block_on(connect_peer_if_necessary(
+                                                       pubkey,
+                                                       peer_addr,
+                                                       peer_manager.clone(),
+                                               ))
                                                .is_ok()
                                        {
                                                println!("SUCCESS: connected to peer {}", pubkey);

diff --git a/src/main.rs b/src/main.rs
index d438682f7a9dd355a119746943b6a3f0256008eb..40240a729711bd33d5c708730b2fb8a44c24615a 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -943,19 +943,25 @@ async fn start_ldk() {
        ));
 
        // Start the CLI.
-       let cli_poll = tokio::spawn(cli::poll_for_user_input(
-               Arc::clone(&peer_manager),
-               Arc::clone(&channel_manager),
-               Arc::clone(&keys_manager),
-               Arc::clone(&network_graph),
-               Arc::clone(&onion_messenger),
-               inbound_payments,
-               outbound_payments,
-               ldk_data_dir,
-               network,
-               Arc::clone(&logger),
-               Arc::clone(&persister),
-       ));
+       let cli_channel_manager = Arc::clone(&channel_manager);
+       let cli_persister = Arc::clone(&persister);
+       let cli_logger = Arc::clone(&logger);
+       let cli_peer_manager = Arc::clone(&peer_manager);
+       let cli_poll = tokio::task::spawn_blocking(move || {
+               cli::poll_for_user_input(
+                       cli_peer_manager,
+                       cli_channel_manager,
+                       keys_manager,
+                       network_graph,
+                       onion_messenger,
+                       inbound_payments,
+                       outbound_payments,
+                       ldk_data_dir,
+                       network,
+                       cli_logger,
+                       cli_persister,
+               )
+       });
 
        // Exit if either CLI polling exits or the background processor exits (which shouldn't happen
        // unless we fail to write to the filesystem).

diff --git a/src/sweep.rs b/src/sweep.rs
index a9ad6bdd8e3c0561959f251325b068703822551c..ad1e9ef4d8698993c2615fd7e0fccfd46114a6bb 100644 (file)
--- a/src/sweep.rs
+++ b/src/sweep.rs
@@ -36,7 +36,7 @@ pub(crate) async fn periodic_sweep(
        // Note that if you more tightly integrate your wallet with LDK you may not need to do this -
        // these outputs can just be treated as normal outputs during coin selection.
        let pending_spendables_dir =
-               format!("{}/{}", crate::PENDING_SPENDABLE_OUTPUT_DIR, ldk_data_dir);
+               format!("{}/{}", ldk_data_dir, crate::PENDING_SPENDABLE_OUTPUT_DIR);
        let processing_spendables_dir = format!("{}/processing_spendable_outputs", ldk_data_dir);
        let spendables_dir = format!("{}/spendable_outputs", ldk_data_dir);