node+cargo: Use single thread, remove LDK bgp

MaxFangX · MaxFangX · commit 057178c71696 · 2022-08-09T21:23:37.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -22,7 +22,6 @@ bitcoin-bech32 = "0.12"
 # lightning-block-sync = { version = "0.0.108", features = [ "rpc-client" ] }
 # lightning-invoice = { version = "0.16" }
 # lightning-net-tokio = { version = "0.0.108" }
-# lightning-background-processor = { version = "0.0.108" }
 # lightning-rapid-gossip-sync = { version = "0.0.108" }
 
 # TODO Switch to back to crates.io version after LDK with lightning-net-tokio
@@ -31,15 +30,13 @@ bitcoin-bech32 = "0.12"
 # lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", features = [ "rpc-client" ], branch = "net-tokio-connect-v0.0.108" }
 lightning-invoice = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
 # lightning-net-tokio = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
-# lightning-background-processor = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
 # lightning-rapid-gossip-sync = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
 
 # NOTE For debugging and testing patches during local development
 # lightning = { path = "../../ldk/lightning", features = ["max_level_trace"]}
 # lightning-block-sync = { path = "../../ldk/lightning-block-sync", features = [ "rpc-client" ] }
 # lightning-invoice = { path = "../../ldk/lightning-invoice" }
 # lightning-net-tokio = { path = "../../ldk/lightning-net-tokio" }
-# lightning-background-processor = { path = "../../ldk/lightning-background-processor" }
 # lightning-rapid-gossip-sync = { path = "../../ldk/lightning-rapid-gossip-sync" }
 
 # --- GENERAL --- #
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -29,7 +29,6 @@ base64 = "0.13.0"
 # lightning-block-sync = { version = "0.0.108", features = [ "rpc-client" ] }
 # lightning-invoice = { version = "0.16" }
 # lightning-net-tokio = { version = "0.0.108" }
-# lightning-background-processor = { version = "0.0.108" }
 # lightning-rapid-gossip-sync = { version = "0.0.108" }
 
 # TODO Switch to back to crates.io version after LDK with lightning-net-tokio
@@ -38,15 +37,13 @@ lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = ["
 lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", features = [ "rpc-client" ], branch = "net-tokio-connect-v0.0.108" }
 lightning-invoice = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
 lightning-net-tokio = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
-lightning-background-processor = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
 lightning-rapid-gossip-sync = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
 
 # NOTE For debugging and testing patches during local development
 # lightning = { path = "../../ldk/lightning", features = ["max_level_trace"]}
 # lightning-block-sync = { path = "../../ldk/lightning-block-sync", features = [ "rpc-client" ] }
 # lightning-invoice = { path = "../../ldk/lightning-invoice" }
 # lightning-net-tokio = { path = "../../ldk/lightning-net-tokio" }
-# lightning-background-processor = { path = "../../ldk/lightning-background-processor" }
 # lightning-rapid-gossip-sync = { path = "../../ldk/lightning-rapid-gossip-sync" }
 
 # ---UTILITIES--- #
@@ -105,7 +102,6 @@ tokio = { version = "=1.15.0", default-features = false, features = [
     "macros",
     "net",
     "rt",
-    "rt-multi-thread",
     "sync",
     "time"
 ] }
@@ -120,7 +116,6 @@ tokio = { version = "=1.15.0", default-features = false, features = [
     "io-util",
     "macros",
     "rt",
-    "rt-multi-thread",
     "sync",
     "test-util", # Used to pause time in inactivity_timer::tests
     "time"
@@ -136,4 +131,5 @@ proptest = "1"
 # stack size (in bytes) for each thread, the default stack size is 0x20000.
 stack-size=0x200000
 # Gotcha: Don't forget to count the main thread when counting number of threads
-threads=7
+# We only need 1 thread at the moment
+threads=1
diff --git a/node/src/cli/mod.rs b/node/src/cli/mod.rs
@@ -21,10 +21,7 @@ impl Args {
     pub fn run(self) -> anyhow::Result<()> {
         match self.cmd {
             NodeCommand::Start(args) => {
-                // TODO(phlip9): set runtime max_blocking_threads and
-                // worker_threads to a reasonable value, then match that value
-                // in the Cargo.toml SGX metadata.
-                let rt = tokio::runtime::Builder::new_multi_thread()
+                let rt = tokio::runtime::Builder::new_current_thread()
                     .enable_all()
                     .build()
                     .expect("Failed to build tokio runtime");
diff --git a/node/src/command/test/mod.rs b/node/src/command/test/mod.rs
@@ -1,10 +1,3 @@
-//! Command tests.
-//!
-//! Note that all tests which call `CommandTestHarness::init()` must use a
-//! multi-threaded runtime, since `LexeNode::init()` starts the
-//! `BackgroundProcessor` which requires its own OS thread. A single worker
-//! thread should be enough.
-
 use std::net::SocketAddr;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -189,7 +182,7 @@ impl CommandTestHarness {
 }
 
 /// Tests that a node can initialize, sync, and shutdown.
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test]
 async fn init_sync_shutdown() {
     let mut args = default_args();
     args.shutdown_after_sync_if_no_activity = true;
@@ -199,7 +192,7 @@ async fn init_sync_shutdown() {
 }
 
 /// Tests the node_info handler.
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test]
 async fn node_info() {
     let args = default_args();
     let h = CommandTestHarness::init(args).await;
@@ -208,7 +201,7 @@ async fn node_info() {
 }
 
 /// Tests the list_channels handler.
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test]
 async fn list_channels() {
     let args = default_args();
     let h = CommandTestHarness::init(args).await;
@@ -217,7 +210,7 @@ async fn list_channels() {
 }
 
 /// Tests connecting two nodes to each other.
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test]
 async fn connect_peer() {
     let args1 = default_args_for_user(UserPk::from_i64(1));
     let args2 = default_args_for_user(UserPk::from_i64(2));
@@ -266,7 +259,7 @@ async fn connect_peer() {
 }
 
 /// Tests opening a channel
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test]
 async fn open_channel() {
     let mut args1 = default_args_for_user(UserPk::from_i64(1));
     let mut args2 = default_args_for_user(UserPk::from_i64(2));
diff --git a/node/src/lexe/persister.rs b/node/src/lexe/persister.rs
@@ -414,18 +414,14 @@ impl Persist<SignerType> for InnerPersister {
         );
 
         // Run an async fn inside a sync fn inside a Tokio runtime
-        tokio::task::block_in_place(|| {
-            Handle::current()
-                .block_on(async move { self.api.create_file(cm_file).await })
-        })
-        .map(|_| ())
-        .map_err(|e| {
-            // Even though this is a temporary failure that can be retried,
-            // we should still log it
-            error!("Could not persist new channel monitor: {:#}", e);
-            // TODO(max): After the async dance this failure should be permanent
-            ChannelMonitorUpdateErr::TemporaryFailure
-        })
+        Handle::current()
+            .block_on(async move { self.api.create_file(cm_file).await })
+            .map(|_| ())
+            .map_err(|e| {
+                // TODO(max): Implement durability then make this err permanent
+                error!("Could not persist new channel monitor: {:#}", e);
+                ChannelMonitorUpdateErr::TemporaryFailure
+            })
     }
 
     fn update_persisted_channel(
@@ -451,17 +447,13 @@ impl Persist<SignerType> for InnerPersister {
         );
 
         // Run an async fn inside a sync fn inside a Tokio runtime
-        tokio::task::block_in_place(|| {
-            Handle::current()
-                .block_on(async move { self.api.upsert_file(cm_file).await })
-        })
-        .map(|_| ())
-        .map_err(|e| {
-            // Even though this is a temporary failure that can be retried,
-            // we should still log it
-            error!("Could not update persisted channel monitor: {:#}", e);
-            // TODO(max): After the async dance this failure should be permanent
-            ChannelMonitorUpdateErr::TemporaryFailure
-        })
+        Handle::current()
+            .block_on(async move { self.api.upsert_file(cm_file).await })
+            .map(|_| ())
+            .map_err(|e| {
+                // TODO(max): Implement durability then make this err permanent
+                error!("Could not update persisted channel monitor: {:#}", e);
+                ChannelMonitorUpdateErr::TemporaryFailure
+            })
     }
 }
