From 5a701b6cca887649408d821686476a80a6139c9b Mon Sep 17 00:00:00 2001 From: Tony Giorgio Date: Fri, 26 Aug 2022 11:23:37 -0500 Subject: [PATCH] Remove unused deps --- Cargo.lock | 270 +++---------------------------------------- Cargo.toml | 33 +----- entity/Cargo.toml | 4 +- migration/Cargo.toml | 2 +- plncore/Cargo.toml | 33 +----- 5 files changed, 20 insertions(+), 322 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a935ee4..66a8705 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -350,25 +350,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "bdk" -version = "0.19.0-dev" -source = "git+https://github.com/bitcoindevkit/bdk?rev=fbd98b4c5a88a10f8dfc22b4c54187eba4d68afe#fbd98b4c5a88a10f8dfc22b4c54187eba4d68afe" -dependencies = [ - "async-trait", - "bdk-macros", - "bitcoin", - "electrum-client", - "js-sys", - "log", - "miniscript", - "rand 0.7.3", - "serde", - "serde_json", - "sled", - "tokio", -] - [[package]] name = "bdk" version = "0.19.0" @@ -1004,7 +985,7 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" name = "entity" version = "0.1.0" dependencies = [ - "bdk 0.19.0-dev", + "bdk", "sea-orm", "serde", "serde_json", @@ -1015,7 +996,7 @@ name = "entity" version = "0.1.0" source = "git+https://github.com/L2-Technology/sensei?rev=bb197d0a81533e17f1f3be1f020c8acc218436ae#bb197d0a81533e17f1f3be1f020c8acc218436ae" dependencies = [ - "bdk 0.19.0", + "bdk", "sea-orm", "serde", "serde_json", @@ -1052,18 +1033,6 @@ version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - [[package]] name = "fastrand" version = "1.7.0" @@ -1685,14 +1654,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "lightning" -version = "0.0.106" -source = "git+https://github.com/lightningdevkit/rust-lightning?rev=08ab6581f1c6254a7765340c5c7a553db58d3a89#08ab6581f1c6254a7765340c5c7a553db58d3a89" -dependencies = [ - "bitcoin", -] - [[package]] name = "lightning" version = "0.0.110" @@ -1702,15 +1663,6 @@ dependencies = [ "bitcoin", ] -[[package]] -name = "lightning-background-processor" -version = "0.0.106" -source = "git+https://github.com/lightningdevkit/rust-lightning?rev=08ab6581f1c6254a7765340c5c7a553db58d3a89#08ab6581f1c6254a7765340c5c7a553db58d3a89" -dependencies = [ - "bitcoin", - "lightning 0.0.106", -] - [[package]] name = "lightning-background-processor" version = "0.0.110" @@ -1718,23 +1670,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8de9d0de42bb933ffb8d33c6b0a75302f08b35126bfc74398ba01ad0c201f8d" dependencies = [ "bitcoin", - "lightning 0.0.110", + "lightning", "lightning-rapid-gossip-sync", ] -[[package]] -name = "lightning-block-sync" -version = "0.0.106" -source = "git+https://github.com/lightningdevkit/rust-lightning?rev=08ab6581f1c6254a7765340c5c7a553db58d3a89#08ab6581f1c6254a7765340c5c7a553db58d3a89" -dependencies = [ - "bitcoin", - "chunked_transfer", - "futures", - "lightning 0.0.106", - "serde", - "serde_json", -] - [[package]] name = "lightning-block-sync" version = "0.0.110" @@ -1744,23 +1683,11 @@ dependencies = [ "bitcoin", "chunked_transfer", "futures", - "lightning 0.0.110", + "lightning", "serde", "serde_json", ] -[[package]] -name = "lightning-invoice" -version = "0.14.0" -source = "git+https://github.com/lightningdevkit/rust-lightning?rev=08ab6581f1c6254a7765340c5c7a553db58d3a89#08ab6581f1c6254a7765340c5c7a553db58d3a89" -dependencies = [ - "bech32", - "bitcoin_hashes", - "lightning 0.0.106", - "num-traits", - "secp256k1", -] - [[package]] name = "lightning-invoice" version = "0.18.0" @@ -1769,21 +1696,11 @@ checksum = "32aa02b7fd0bd95e40b6ca8d9d9232b162d5e23b41bd2bc42abe9e9c78d34d72" dependencies = [ "bech32", "bitcoin_hashes", - "lightning 0.0.110", + "lightning", "num-traits", "secp256k1", ] -[[package]] -name = "lightning-net-tokio" -version = "0.0.106" -source = "git+https://github.com/lightningdevkit/rust-lightning?rev=08ab6581f1c6254a7765340c5c7a553db58d3a89#08ab6581f1c6254a7765340c5c7a553db58d3a89" -dependencies = [ - "bitcoin", - "lightning 0.0.106", - "tokio", -] - [[package]] name = "lightning-net-tokio" version = "0.0.110" @@ -1791,21 +1708,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce57d093fbc643835bc64c0501b52a3531d2511dcb1237d0495d68fea3adc47d" dependencies = [ "bitcoin", - "lightning 0.0.110", + "lightning", "tokio", ] -[[package]] -name = "lightning-persister" -version = "0.0.106" -source = "git+https://github.com/lightningdevkit/rust-lightning?rev=08ab6581f1c6254a7765340c5c7a553db58d3a89#08ab6581f1c6254a7765340c5c7a553db58d3a89" -dependencies = [ - "bitcoin", - "libc", - "lightning 0.0.106", - "winapi", -] - [[package]] name = "lightning-persister" version = "0.0.110" @@ -1814,7 +1720,7 @@ checksum = "9abe8137de42431ed344f64821c12cf02f934c7869f5f8febaa1b3cb851e1fc1" dependencies = [ "bitcoin", "libc", - "lightning 0.0.110", + "lightning", "winapi", ] @@ -1825,7 +1731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "391732631b14f7a1d9dc84dc3f644484d9b73190a31087b3856505cf0525bea0" dependencies = [ "bitcoin", - "lightning 0.0.110", + "lightning", ] [[package]] @@ -1930,16 +1836,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2237,100 +2133,39 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "base64 0.13.0", - "bdk 0.19.0-dev", - "bech32", "bitcoin", - "bitcoin-bech32", - "bitcoincore-rpc", - "bitcoind", - "chrono", "clap 3.1.18", "dirs 4.0.0", "entity 0.1.0", "env_logger", - "futures", - "headers", - "http", "hyper", - "lightning 0.0.106", - "lightning-background-processor 0.0.106", - "lightning-block-sync 0.0.106", - "lightning-invoice 0.14.0", - "lightning-net-tokio 0.0.106", - "lightning-persister 0.0.106", - "log", "macaroon", "migration 0.1.0", - "mime_guess", "pin-project", "plncore", - "portpicker", "prost", - "public-ip", - "rand 0.8.5", - "rusqlite", - "rust-embed", "senseicore", - "serde", - "serde_json", - "serial_test", "signal-hook", - "tindercrypt", "tokio", "tonic", "tonic-build", "tower", "tower-cookies", - "tower-http", - "uuid", - "zeroize", ] [[package]] name = "plncore" version = "0.1.0" dependencies = [ - "axum", - "base64 0.13.0", - "bdk 0.19.0-dev", - "bech32", - "bitcoin", - "bitcoin-bech32", - "bitcoincore-rpc", "bitcoind", - "chrono", - "clap 3.1.18", - "dirs 4.0.0", "entity 0.1.0", - "env_logger", - "futures", - "headers", - "http", - "hyper", - "lightning 0.0.106", - "lightning-background-processor 0.0.106", - "lightning-block-sync 0.0.106", - "lightning-invoice 0.14.0", - "lightning-net-tokio 0.0.106", - "lightning-persister 0.0.106", - "log", "macaroon", "migration 0.1.0", - "mime_guess", - "pin-project", - "portpicker", - "public-ip", "rand 0.8.5", - "rust-embed", "senseicore", "serde", - "serde_json", "serial_test", - "tindercrypt", "tokio", - "tower", - "uuid", ] [[package]] @@ -2346,15 +2181,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "portpicker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" -dependencies = [ - "rand 0.8.5", -] - [[package]] name = "ppv-lite86" version = "0.2.16" @@ -2833,56 +2659,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rusqlite" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4b1eaf239b47034fb450ee9cdedd7d0226571689d8823030c4b6c2cb407152" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "memchr", - "smallvec", - "uuid", -] - -[[package]] -name = "rust-embed" -version = "6.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a17e5ac65b318f397182ae94e532da0ba56b88dd1200b774715d36c4943b1c3" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e763e24ba2bf0c72bc6be883f967f794a019fafd1b86ba1daff9c91a7edd30" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756feca3afcbb1487a1d01f4ecd94cf8ec98ea074c55a69e7136d29fb6166029" -dependencies = [ - "sha2", - "walkdir", -] - [[package]] name = "rust_decimal" version = "1.24.0" @@ -3154,7 +2930,7 @@ dependencies = [ "base32", "base64 0.13.0", "bcrypt", - "bdk 0.19.0", + "bdk", "bech32", "bitcoin", "bitcoin-bech32", @@ -3164,12 +2940,12 @@ dependencies = [ "entity 0.1.0 (git+https://github.com/L2-Technology/sensei?rev=bb197d0a81533e17f1f3be1f020c8acc218436ae)", "futures", "hyper", - "lightning 0.0.110", - "lightning-background-processor 0.0.110", - "lightning-block-sync 0.0.110", - "lightning-invoice 0.18.0", - "lightning-net-tokio 0.0.110", - "lightning-persister 0.0.110", + "lightning", + "lightning-background-processor", + "lightning-block-sync", + "lightning-invoice", + "lightning-net-tokio", + "lightning-persister", "lightning-rapid-gossip-sync", "log", "macaroon", @@ -4018,17 +3794,10 @@ dependencies = [ "http", "http-body", "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", "pin-project-lite", - "tokio", - "tokio-util 0.7.3", "tower", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -4175,15 +3944,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.8" diff --git a/Cargo.toml b/Cargo.toml index ec435d1..ead4156 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,52 +9,23 @@ edition = "2021" members = [".", "entity", "migration", "plncore"] [dependencies] -lightning = { version = "0.0.106", features = ["max_level_trace"], git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-block-sync = { version = "0.0.106", features = [ "rpc-client" ], git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-invoice = { version = "0.14.0", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-net-tokio = { version = "0.0.106", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-persister = { version = "0.0.106", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-background-processor = { version = "0.0.106", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } senseicore = { git = "https://github.com/L2-Technology/sensei", rev = "bb197d0a81533e17f1f3be1f020c8acc218436ae" } -base64 = "0.13.0" signal-hook = "0.3.14" bitcoin = "0.28.1" -bitcoin-bech32 = "0.12" -zeroize = "1.5.7" -bech32 = "0.8" -futures = "0.3" -chrono = "0.4" -rand = "0.8.4" axum = { version = "0.4.2", features = ["headers"] } -http = "0.2" tower = { version = "0.4", features = ["full"] } -serde = { version = "^1.0", features = ["derive"] } -serde_json = { version = "1.0" } -tokio = { version = "1.17", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] } -log = "0.4.16" +tokio = { version = "^1.0", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] } env_logger = "0.9.0" -bitcoincore-rpc = "0.15" -bdk = { git = "https://github.com/bitcoindevkit/bdk", rev = "fbd98b4c5a88a10f8dfc22b4c54187eba4d68afe" } tonic = "0.6" prost = "0.9" pin-project = "1.0" hyper = "0.14" clap = { version = "3.0", features = [ "derive", "env" ] } -headers = "0.3" -tindercrypt = { version = "0.3.2", default-features = false } -portpicker = "0.1" -rusqlite = { version = "0.25.3", features = ["uuid", "bundled"] } -uuid = { version = "0.8", features = ["serde", "v4"] } macaroon = "0.2" -tower-http = { version = "0.2.5", features = ["fs", "trace", "cors"] } tower-cookies = "0.4" dirs = "4.0" -public-ip = "0.2" -rust-embed="6.3.0" -mime_guess = { version = "2" } entity = { path = "entity" } migration = { path = "migration" } -# senseicore = { path = "senseicore" } plncore = { path = "plncore" } anyhow = "1.0.58" @@ -62,5 +33,3 @@ anyhow = "1.0.58" tonic-build = "0.6" [dev-dependencies] -bitcoind = { version = "0.26", features = [ "22_0" ] } -serial_test = "0.6.0" diff --git a/entity/Cargo.toml b/entity/Cargo.toml index d295321..b38ee96 100644 --- a/entity/Cargo.toml +++ b/entity/Cargo.toml @@ -9,9 +9,9 @@ name = "entity" path = "src/lib.rs" [dependencies] -serde = { version = "1", features = ["derive"] } +serde = { version = "^1.0", features = ["derive"] } serde_json = { version = "1.0" } -bdk = { git = "https://github.com/bitcoindevkit/bdk", rev = "fbd98b4c5a88a10f8dfc22b4c54187eba4d68afe" } +bdk = "0.19" [dependencies.sea-orm] version = "^0.7.1" diff --git a/migration/Cargo.toml b/migration/Cargo.toml index 00c265e..ff9b4ef 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -10,4 +10,4 @@ path = "src/lib.rs" [dependencies] sea-schema = { version = "^0.7.1", default-features = false, features = [ "migration", "debug-print" ] } -entity = { path = "../entity" } \ No newline at end of file +entity = { path = "../entity" } diff --git a/plncore/Cargo.toml b/plncore/Cargo.toml index 13cb13d..8737966 100644 --- a/plncore/Cargo.toml +++ b/plncore/Cargo.toml @@ -9,41 +9,10 @@ name = "plncore" path = "src/lib.rs" [dependencies] -lightning = { version = "0.0.106", features = ["max_level_trace"], git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-block-sync = { version = "0.0.106", features = [ "rpc-client" ], git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-invoice = { version = "0.14.0", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-net-tokio = { version = "0.0.106", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-persister = { version = "0.0.106", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -lightning-background-processor = { version = "0.0.106", git = "https://github.com/lightningdevkit/rust-lightning", rev = "08ab6581f1c6254a7765340c5c7a553db58d3a89" } -base64 = "0.13.0" -bitcoin = "0.28" -bitcoin-bech32 = "0.12" -bech32 = "0.8" -futures = "0.3" -chrono = "0.4" rand = "0.8.4" -axum = { version = "0.4.2", features = ["headers"] } -http = "0.2" -tower = { version = "0.4", features = ["full"] } serde = { version = "^1.0", features = ["derive"] } -serde_json = { version = "1.0" } -tokio = { version = "1", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] } -log = "0.4.16" -env_logger = "0.9.0" -bitcoincore-rpc = "0.15" -bdk = { git = "https://github.com/bitcoindevkit/bdk", rev = "fbd98b4c5a88a10f8dfc22b4c54187eba4d68afe" } -pin-project = "1.0" -hyper = "0.14" -clap = { version = "3.0", features = [ "derive", "env" ] } -headers = "0.3" -tindercrypt = { version = "0.3.2", default-features = false } -portpicker = "0.1" -uuid = { version = "0.8", features = ["serde", "v4"] } +tokio = { version = "^1.0", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] } macaroon = "0.2" -dirs = "4.0" -public-ip = "0.2" -rust-embed="6.3.0" -mime_guess = { version = "2" } entity = { path = "../entity" } migration = { path = "../migration" } senseicore = { git = "https://github.com/L2-Technology/sensei", rev = "bb197d0a81533e17f1f3be1f020c8acc218436ae" }