diff --git a/cli/Cargo.lock b/cli/Cargo.lock index cd2a178c2..303206663 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -140,21 +131,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base64" version = "0.13.1" @@ -289,7 +265,6 @@ dependencies = [ "rusqlite", "rusqlite_migration", "thiserror", - "tokio", ] [[package]] @@ -303,7 +278,6 @@ dependencies = [ "env_logger", "log", "rustyline", - "tokio", ] [[package]] @@ -564,12 +538,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - [[package]] name = "half" version = "1.8.3" @@ -601,12 +569,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hex" version = "0.4.3" @@ -857,25 +819,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.19.0" @@ -1050,12 +993,6 @@ dependencies = [ "rusqlite", ] -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustix" version = "0.38.31" @@ -1324,29 +1261,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "num_cpus", - "pin-project-lite", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tracing" version = "0.1.40" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index e717116a2..55f8772b4 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -13,4 +13,3 @@ clap = { version = "4.5.1", features = ["derive"] } env_logger = "0.11" log = "0.4.20" rustyline = { version = "13.0.0", features = ["derive"] } -tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] } diff --git a/cli/src/commands.rs b/cli/src/commands.rs index 3d6639630..52b3d578f 100644 --- a/cli/src/commands.rs +++ b/cli/src/commands.rs @@ -40,7 +40,7 @@ impl Highlighter for CliHelper { } } -pub(crate) async fn handle_command( +pub(crate) fn handle_command( _rl: &mut Editor, wallet: &Arc, command: Command, diff --git a/cli/src/main.rs b/cli/src/main.rs index dd752645f..0c6407423 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -33,8 +33,7 @@ fn init_persistence(args: &Args) -> Result { Ok(CliPersistence { data_dir }) } -#[tokio::main] -async fn main() -> Result<()> { +fn main() -> Result<()> { env_logger::init(); let args = Args::parse(); @@ -65,7 +64,7 @@ async fn main() -> Result<()> { println!("{}", cli_res.unwrap_err()); continue; } - let res = handle_command(rl, &wallet, cli_res.unwrap()).await; + let res = handle_command(rl, &wallet, cli_res.unwrap()); show_results(res); } Err(ReadlineError::Interrupted) => { diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 7a5afd358..518e65c1c 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -92,21 +83,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base64" version = "0.13.1" @@ -241,7 +217,6 @@ dependencies = [ "rusqlite", "rusqlite_migration", "thiserror", - "tokio", ] [[package]] @@ -391,12 +366,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - [[package]] name = "half" version = "1.8.3" @@ -631,15 +600,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.19.0" @@ -804,12 +764,6 @@ dependencies = [ "rusqlite", ] -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustls" version = "0.21.10" @@ -1025,16 +979,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "pin-project-lite", -] - [[package]] name = "tracing" version = "0.1.40" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 7abc39fdc..09ddc8a73 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -18,4 +18,3 @@ lwk_wollet = "0.2.0" rusqlite = "0.29" rusqlite_migration = "1.0" thiserror = "1.0.57" -tokio = "1.36.0"