From a9d0f3711108ddb27599dc3e91834bb6cd02f821 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Tue, 31 Jan 2023 13:35:42 +0200 Subject: [PATCH] feat: remove unused dependencies (#5144) * remove unused * remove unused from cucumber * added in ignore for wallet_ffi --------- Co-authored-by: Cayle Sharrock --- Cargo.lock | 199 ------------------ applications/tari_app_grpc/Cargo.toml | 5 +- applications/tari_app_utilities/Cargo.toml | 4 - applications/tari_base_node/Cargo.toml | 6 - applications/tari_console_wallet/Cargo.toml | 4 +- .../tari_merge_mining_proxy/Cargo.toml | 3 - applications/tari_miner/Cargo.toml | 3 - base_layer/common_types/Cargo.toml | 3 +- base_layer/core/Cargo.toml | 2 - base_layer/key_manager/Cargo.toml | 5 +- base_layer/p2p/Cargo.toml | 4 - base_layer/tari_mining_helper_ffi/Cargo.toml | 2 - base_layer/wallet/Cargo.toml | 8 +- common/Cargo.toml | 2 - comms/core/Cargo.toml | 2 - comms/dht/Cargo.toml | 3 - infrastructure/libtor/Cargo.toml | 2 - infrastructure/storage/Cargo.toml | 1 - integration_tests/Cargo.toml | 25 +-- 19 files changed, 15 insertions(+), 268 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00bb6c53b9..eaa8890b13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,70 +190,6 @@ dependencies = [ "cc", ] -[[package]] -name = "axum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes 1.3.0", - "futures-util", - "http", - "http-body", - "hyper", - "itoa 1.0.5", - "matchit", - "memchr", - "mime", - "percent-encoding 2.2.0", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" -dependencies = [ - "async-trait", - "bytes 1.3.0", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-jrpc" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "163372a0c1cb179c5b3a9ac5edbb01501b4d4ad247b971712d0559e832819e3a" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "base58-monero" version = "0.3.2" @@ -2435,12 +2371,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - [[package]] name = "httparse" version = "1.8.0" @@ -2611,25 +2541,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "indexmap" version = "1.9.2" @@ -3005,12 +2916,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - [[package]] name = "md-5" version = "0.9.1" @@ -4486,12 +4391,6 @@ dependencies = [ "base64 0.13.1", ] -[[package]] -name = "rustversion" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" - [[package]] name = "rustyline" version = "9.1.2" @@ -4708,15 +4607,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" -dependencies = [ - "serde", -] - [[package]] name = "serde_repr" version = "0.1.10" @@ -5028,12 +4918,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" - [[package]] name = "synstructure" version = "0.12.6" @@ -5087,9 +4971,7 @@ dependencies = [ "base64 0.13.1", "borsh", "chrono", - "digest 0.9.0", "log", - "num-traits", "prost", "prost-types", "rand 0.8.5", @@ -5110,18 +4992,14 @@ name = "tari_app_utilities" version = "0.44.1" dependencies = [ "clap 3.2.23", - "config", - "dirs-next 1.0.2", "futures 0.3.25", "json5 0.2.8", "log", "rand 0.7.3", "serde", - "structopt", "tari_common", "tari_common_types", "tari_comms", - "tari_crypto", "tari_utilities", "thiserror", "tokio", @@ -5145,15 +5023,11 @@ dependencies = [ "log", "log-mdc", "nom 7.1.2", - "num_cpus", "qrcode", - "regex", "rustyline", "rustyline-derive", "serde", - "serde_json", "strum", - "strum_macros", "tari_app_grpc", "tari_app_utilities", "tari_common", @@ -5164,7 +5038,6 @@ dependencies = [ "tari_crypto", "tari_libtor", "tari_metrics", - "tari_mmr", "tari_p2p", "tari_service_framework", "tari_shutdown", @@ -5173,7 +5046,6 @@ dependencies = [ "thiserror", "tokio", "tonic", - "tracing", ] [[package]] @@ -5232,7 +5104,6 @@ dependencies = [ "anyhow", "blake2 0.9.2", "config", - "derivative", "dirs-next 1.0.2", "git2", "log", @@ -5243,7 +5114,6 @@ dependencies = [ "serde", "serde_json", "sha2 0.9.9", - "sha3", "structopt", "tari_crypto", "tari_test_utils", @@ -5265,7 +5135,6 @@ dependencies = [ name = "tari_common_types" version = "0.44.1" dependencies = [ - "base64 0.13.1", "borsh", "digest 0.9.0", "lazy_static", @@ -5277,7 +5146,6 @@ dependencies = [ "tari_utilities", "thiserror", "tokio", - "zeroize", ] [[package]] @@ -5305,7 +5173,6 @@ dependencies = [ "once_cell", "pin-project 1.0.12", "prost", - "prost-types", "rand 0.7.3", "serde", "serde_derive", @@ -5348,7 +5215,6 @@ dependencies = [ "futures-test", "futures-util", "lazy_static", - "libsqlite3-sys", "lmdb-zero", "log", "log-mdc", @@ -5358,7 +5224,6 @@ dependencies = [ "prost-types", "rand 0.7.3", "serde", - "serde_derive", "tari_common", "tari_common_sqlite", "tari_comms", @@ -5395,7 +5260,6 @@ dependencies = [ name = "tari_console_wallet" version = "0.44.1" dependencies = [ - "base64 0.13.1", "bitflags 1.3.2", "chrono", "clap 3.2.23", @@ -5432,7 +5296,6 @@ dependencies = [ "thiserror", "tokio", "tonic", - "tracing", "tui", "unicode-segmentation", "unicode-width", @@ -5444,7 +5307,6 @@ dependencies = [ name = "tari_core" version = "0.44.1" dependencies = [ - "async-trait", "bincode", "bitflags 1.3.2", "blake2 0.9.2", @@ -5500,7 +5362,6 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-attributes", "uint", "zeroize", ] @@ -5542,32 +5403,16 @@ version = "0.35.1" dependencies = [ "anyhow", "async-trait", - "axum", - "axum-jrpc", - "bincode", - "blake2 0.9.2", - "borsh", - "bytes 1.3.0", "chrono", - "clap 3.2.23", "config", "csv", "cucumber", - "diesel", - "digest 0.9.0", "futures 0.3.25", - "include_dir", "indexmap", - "json5 0.2.8", "libc", - "libsqlite3-sys", - "lmdb-zero", "log", - "log4rs", - "prost", "rand 0.7.3", "reqwest", - "serde", "serde_json", "tari_app_grpc", "tari_app_utilities", @@ -5585,7 +5430,6 @@ dependencies = [ "tari_p2p", "tari_script", "tari_shutdown", - "tari_test_utils", "tari_utilities", "tari_wallet", "tari_wallet_ffi", @@ -5594,11 +5438,7 @@ dependencies = [ "thiserror", "time 0.3.17", "tokio", - "tokio-stream", "tonic", - "tower", - "tower-http", - "tower-layer", ] [[package]] @@ -5612,12 +5452,9 @@ dependencies = [ "crc32fast", "derivative", "digest 0.9.0", - "getrandom 0.2.8", "js-sys", "rand 0.7.3", "serde", - "serde_derive", - "serde_json", "sha2 0.9.9", "strum", "strum_macros", @@ -5638,8 +5475,6 @@ dependencies = [ "derivative", "libtor", "log", - "log4rs", - "multiaddr", "rand 0.7.3", "tari_common", "tari_p2p", @@ -5660,17 +5495,14 @@ dependencies = [ "clap 3.2.23", "config", "crossterm 0.25.0", - "derivative", "futures 0.3.25", "hex", "hyper", "jsonrpc", "log", - "rand 0.7.3", "reqwest", "serde", "serde_json", - "structopt", "tari_app_utilities", "tari_base_node_grpc_client", "tari_common", @@ -5720,10 +5552,8 @@ dependencies = [ "num_cpus", "prost-types", "rand 0.7.3", - "reqwest", "serde", "serde_json", - "sha3", "tari_app_grpc", "tari_app_utilities", "tari_common", @@ -5745,8 +5575,6 @@ dependencies = [ "hex", "libc", "rand 0.7.3", - "serde", - "serde_json", "tari_common", "tari_comms", "tari_core", @@ -5779,8 +5607,6 @@ name = "tari_p2p" version = "0.44.1" dependencies = [ "anyhow", - "bytes 0.5.6", - "chrono", "clap 2.34.0", "config", "fs2", @@ -5795,7 +5621,6 @@ dependencies = [ "rustls", "semver", "serde", - "serde_derive", "tari_common", "tari_comms", "tari_comms_dht", @@ -5810,7 +5635,6 @@ dependencies = [ "tokio", "tokio-stream", "tower", - "tower-service", "trust-dns-client", "webpki 0.21.4", ] @@ -5866,7 +5690,6 @@ dependencies = [ "log", "rand 0.7.3", "serde", - "serde_derive", "tari_utilities", "thiserror", ] @@ -5921,9 +5744,7 @@ dependencies = [ "futures 0.3.25", "itertools 0.10.5", "libsqlite3-sys", - "lmdb-zero", "log", - "log4rs", "prost", "rand 0.7.3", "serde", @@ -5943,7 +5764,6 @@ dependencies = [ "tari_script", "tari_service_framework", "tari_shutdown", - "tari_storage", "tari_test_utils", "tari_utilities", "tempfile", @@ -6355,25 +6175,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags 1.3.2", - "bytes 1.3.0", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.2" diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml index 50da9cf141..79384b9c1b 100644 --- a/applications/tari_app_grpc/Cargo.toml +++ b/applications/tari_app_grpc/Cargo.toml @@ -19,9 +19,7 @@ argon2 = { version = "0.4.1", features = ["std", "password-hash"] } base64 = "0.13.0" borsh = "0.9.3" chrono = { version = "0.4.19", default-features = false } -digest = "0.9" log = "0.4" -num-traits = "0.2.15" prost = "0.9" prost-types = "0.9" rand = "0.8.5" @@ -32,3 +30,6 @@ zeroize = "1" [build-dependencies] tonic-build = "0.6.2" +[package.metadata.cargo-machete] +ignored = ["prost"] # this is so we can run cargo machete without getting false positive about macro dependancies + diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml index c6726db7af..9979f8846a 100644 --- a/applications/tari_app_utilities/Cargo.toml +++ b/applications/tari_app_utilities/Cargo.toml @@ -7,21 +7,17 @@ license = "BSD-3-Clause" [dependencies] tari_comms = { path = "../../comms/core" } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } tari_common = { path = "../../common" } tari_common_types = { path = "../../base_layer/common_types" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } clap = { version = "3.2.0", features = ["derive", "env"] } -config = { version = "0.13.0" } futures = { version = "^0.3.16", default-features = false, features = ["alloc"] } -dirs-next = "1.0.2" json5 = "0.2.2" log = { version = "0.4.8", features = ["std"] } rand = "0.7.3" tokio = { version = "1.23", features = ["signal"] } serde = "1.0.126" -structopt = { version = "0.3.13", default_features = false } thiserror = "^1.0.26" [build-dependencies] diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml index af885dcabd..740276c15d 100644 --- a/applications/tari_base_node/Cargo.toml +++ b/applications/tari_base_node/Cargo.toml @@ -17,7 +17,6 @@ tari_comms_dht = { path = "../../comms/dht" } tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } tari_libtor = { path = "../../infrastructure/libtor", optional = true } -tari_mmr = { path = "../../base_layer/mmr", features = ["native_bitmap"] } tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] } tari_storage = {path="../../infrastructure/storage"} tari_service_framework = { path = "../../base_layer/service_framework" } @@ -38,19 +37,14 @@ futures = { version = "^0.3.16", default-features = false, features = ["alloc"] qrcode = { version = "0.12" } log = { version = "0.4.8", features = ["std"] } log-mdc = "0.1.0" -num_cpus = "1" nom = "7.1.0" -regex = "1" rustyline = "9.0" rustyline-derive = "0.5" serde = "1.0.136" -serde_json = "1.0.79" strum = { version = "0.22", features = ["derive"] } -strum_macros = "0.22" thiserror = "^1.0.26" tokio = { version = "1.23", features = ["signal"] } tonic = "0.6.2" -tracing = "0.1.26" # Metrics tari_metrics = { path = "../../infrastructure/metrics", optional = true, features = ["server"] } diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml index c74de8599a..c59be2c859 100644 --- a/applications/tari_console_wallet/Cargo.toml +++ b/applications/tari_console_wallet/Cargo.toml @@ -27,7 +27,6 @@ tari_script = { path = "../../infrastructure/tari_script" } # Uncomment for normal use (non tokio-console tracing) tokio = { version = "1.23", default-features = false, features = ["signal", "sync"] } -base64 = "0.13.0" bitflags = "1.2.1" chrono = { version = "0.4.19", default-features = false } clap = { version = "3.1.1", features = ["derive", "env"] } @@ -48,7 +47,6 @@ strum = "0.22" strum_macros = "0.22" thiserror = "1.0.26" tonic = "0.6.2" -tracing = "0.1.26" unicode-segmentation = "1.6.0" unicode-width = "0.1" zeroize = "1" @@ -68,3 +66,5 @@ features = ["crossterm"] avx2 = ["tari_core/avx2", "tari_crypto/simd_backend", "tari_wallet/avx2", "tari_comms/avx2", "tari_comms_dht/avx2", "tari_p2p/avx2", "tari_key_manager/avx2"] libtor = ["tari_libtor"] +[package.metadata.cargo-machete] +ignored = ["strum"] diff --git a/applications/tari_merge_mining_proxy/Cargo.toml b/applications/tari_merge_mining_proxy/Cargo.toml index ebb94d5839..5a74ae1911 100644 --- a/applications/tari_merge_mining_proxy/Cargo.toml +++ b/applications/tari_merge_mining_proxy/Cargo.toml @@ -27,17 +27,14 @@ bytes = "1.1" chrono = { version = "0.4.6", default-features = false } clap = { version = "3.1.1", features = ["derive", "env"] } config = { version = "0.13.0" } -derivative = "2.2.0" futures = "0.3.5" hex = "0.4.2" hyper = "0.14.12" jsonrpc = "0.12.0" log = { version = "0.4.8", features = ["std"] } -rand = "0.7.3" reqwest = { version = "0.11.4", features = ["json"] } serde = { version = "1.0.106", features = ["derive"] } serde_json = "1.0.57" -structopt = { version = "0.3.13", default_features = false } thiserror = "1.0.26" tokio = { version = "1.23", features = ["macros"] } tonic = "0.6.2" diff --git a/applications/tari_miner/Cargo.toml b/applications/tari_miner/Cargo.toml index 8cb83c33c7..5e3fe6e42e 100644 --- a/applications/tari_miner/Cargo.toml +++ b/applications/tari_miner/Cargo.toml @@ -24,14 +24,11 @@ crossbeam = "0.8" futures = "0.3" log = { version = "0.4", features = ["std"] } num_cpus = "1.13" -prost-types = "0.9" rand = "0.7.3" -sha3 = "0.9" serde = { version = "1.0", default_features = false, features = ["derive"] } tonic = { version = "0.6.2", features = ["transport"] } tokio = { version = "1.23", default_features = false, features = ["rt-multi-thread"] } thiserror = "1.0" -reqwest = { version = "0.11", features = ["json"] } serde_json = "1.0.57" native-tls = "0.2" bufstream = "0.1" diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index 5b53394e6f..444fd20540 100644 --- a/base_layer/common_types/Cargo.toml +++ b/base_layer/common_types/Cargo.toml @@ -12,7 +12,7 @@ tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", t # TODO: remove this dependency and move Network into tari_common_types tari_common = { version = "^0.44", path = "../../common" } -base64 = "0.13.0" + borsh = "0.9.3" digest = "0.9.0" lazy_static = "1.4.0" @@ -21,4 +21,3 @@ rand = "0.7.3" serde = { version = "1.0.106", features = ["derive"] } thiserror = "1.0.29" tokio = { version = "1.23", features = ["time", "sync"] } -zeroize = "1" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index c3458d800e..240bf6362e 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -35,7 +35,6 @@ tari_storage = { version = "^0.44", path = "../../infrastructure/storage" } tari_test_utils = { version = "^0.44", path = "../../infrastructure/test_utils" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.10", features = ["borsh"] } -async-trait = "0.1.50" bincode = "1.1.4" bitflags = "1.0.4" blake2 = "^0.9.0" @@ -73,7 +72,6 @@ strum_macros = "0.22" thiserror = "1.0.26" tokio = { version = "1.23", features = ["time", "sync", "macros"] } tracing = "0.1.26" -tracing-attributes = "*" uint = { version = "0.9", default-features = false } zeroize = "1" diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index c7a82b72b3..35a09951aa 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -23,12 +23,9 @@ console_error_panic_hook = { version = "0.1.7", optional = true } crc32fast = "1.2.1" derivative = "2.2.0" digest = "0.9.0" -getrandom = { version = "0.2.3", optional = true } js-sys = { version = "0.3.55", optional = true } rand = "0.7.3" serde = "1.0.89" -serde_derive = "1.0.89" -serde_json = "1.0.39" thiserror = "1.0.26" strum_macros = "0.22" strum = { version = "0.22", features = ["derive"] } @@ -42,5 +39,5 @@ wasm-bindgen-test = "0.3.28" [features] avx2 = ["tari_crypto/simd_backend"] -js = ["getrandom/js", "js-sys"] +js = [ "js-sys"] wasm = ["tari_crypto/wasm", "wasm-bindgen", "js", "tari_common_types", "console_error_panic_hook"] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 16442551a6..712241636c 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -20,8 +20,6 @@ tari_storage = { version = "^0.44", path = "../../infrastructure/storage" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } anyhow = "1.0.53" -bytes = "0.5" -chrono = { version = "0.4.19", default-features = false, features = ["serde"] } fs2 = "0.4.0" futures = { version = "^0.3.1" } lmdb-zero = "0.4.4" @@ -33,12 +31,10 @@ reqwest = { version = "0.11", optional = true, default-features = false } rustls = "0.20.2" semver = { version = "1.0.1", optional = true } serde = "1.0.90" -serde_derive = "1.0.90" thiserror = "1.0.26" tokio = { version = "1.23", features = ["macros"] } tokio-stream = { version = "0.1.9", default-features = false, features = ["time"] } tower = "0.4.11" -tower-service = { version = "0.3.1" } trust-dns-client = { version = "=0.21.0-alpha.5", features = ["dns-over-rustls"] } webpki = "0.21" diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml index ccae7d0612..511e0faf2c 100644 --- a/base_layer/tari_mining_helper_ffi/Cargo.toml +++ b/base_layer/tari_mining_helper_ffi/Cargo.toml @@ -16,8 +16,6 @@ libc = "0.2.65" thiserror = "1.0.26" borsh = "0.9.3" hex = "0.4.2" -serde = { version="1.0.106", features = ["derive"] } -serde_json = "1.0.57" [dev-dependencies] tari_core = { path = "../core", features = ["transactions", "base_node"]} diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index a531473698..450a8667fe 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -18,7 +18,6 @@ tari_p2p = { version = "^0.44", path = "../p2p", features = ["auto-update"] } tari_script = { path = "../../infrastructure/tari_script" } tari_service_framework = { version = "^0.44", path = "../service_framework" } tari_shutdown = { version = "^0.44", path = "../../infrastructure/shutdown" } -tari_storage = { version = "^0.44", path = "../../infrastructure/storage" } tari_common_sqlite = { path = "../../common_sqlite" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } @@ -42,9 +41,7 @@ digest = "0.9.0" fs2 = "0.4.0" futures = { version = "^0.3.1", features = ["compat", "std"] } libsqlite3-sys = { version = "0.22.2", features = ["bundled"], optional = true } -lmdb-zero = "0.4.4" log = "0.4.6" -log4rs = { version = "1.2.0", features = ["console_appender", "file_appender", "yaml_format"] } rand = "0.7.3" serde = { version = "1.0.89", features = ["derive"] } serde_json = "1.0.39" @@ -67,7 +64,10 @@ env_logger = "0.7.1" prost = "0.9.0" [features] -default=["bundled_sqlite"] +default=[] c_integration = [] avx2 = ["tari_crypto/simd_backend", "tari_core/avx2"] bundled_sqlite = ["libsqlite3-sys"] + +[package.metadata.cargo-machete] +ignored = ["libsqlite3-sys"] # this is so we can run cargo machete without getting false positive about macro dependancies \ No newline at end of file diff --git a/common/Cargo.toml b/common/Cargo.toml index b636d208c1..8f41f1038e 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -18,7 +18,6 @@ tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = " anyhow = "1.0.53" config = { version = "0.13.0", default_features = false, features = ["toml"] } -derivative = "2.2.0" dirs-next = "1.0.2" git2 = { version = "0.8", default_features = false, optional = true } log = "0.4.8" @@ -34,7 +33,6 @@ tempfile = "3.1.0" thiserror = "1.0.29" toml = { version = "0.5", optional = true } blake2 = "0.9.1" -sha3 = "0.9.0" [dev-dependencies] tari_test_utils = { version = "^0.44", path = "../infrastructure/test_utils"} diff --git a/comms/core/Cargo.toml b/comms/core/Cargo.toml index 46487ed33e..70adaba8cf 100644 --- a/comms/core/Cargo.toml +++ b/comms/core/Cargo.toml @@ -11,7 +11,6 @@ edition = "2018" [dependencies] tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } -tari_common = {path = "../../common"} tari_metrics = { path = "../../infrastructure/metrics" } tari_storage = { version = "^0.44", path = "../../infrastructure/storage" } tari_shutdown = { version = "^0.44", path = "../../infrastructure/shutdown" } @@ -37,7 +36,6 @@ nom = { version = "5.1.0", features = ["std"], default-features = false } once_cell = "1.8.0" pin-project = "1.0.8" prost = "=0.9.0" -prost-types = "0.9.0" rand = "0.7.3" serde = "1.0.119" serde_derive = "1.0.119" diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index b342cb7be4..dc2ad4930d 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -26,7 +26,6 @@ chacha20poly1305 = "0.10.1" chrono = { version = "0.4.19", default-features = false } diesel = { version = "1.4.7", features = ["sqlite", "serde_json", "chrono", "numeric"] } diesel_migrations = "1.4.0" -libsqlite3-sys = { version = "0.22.2", features = ["bundled"], optional = true } digest = "0.9.0" futures = "^0.3.1" log = "0.4.8" @@ -35,7 +34,6 @@ prost = "=0.9.0" prost-types = "=0.9.0" rand = "0.7.3" serde = "1.0.90" -serde_derive = "1.0.90" thiserror = "1.0.26" tower = { version = "0.4", features = ["full"] } zeroize = "1" @@ -69,4 +67,3 @@ tari_common = { version = "^0.44", path = "../../common" } [features] test-mocks = [] avx2 = ["tari_crypto/simd_backend"] -bundled-sqlite = ["libsqlite3-sys"] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 27222b8336..2024b16d4c 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -11,8 +11,6 @@ tari_shutdown = { version = "^0.44", path = "../shutdown"} derivative = "2.2.0" log = "0.4.8" -log4rs = { version = "1.2.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] } -multiaddr = { version = "0.14.0" } rand = "0.7.3" tempfile = "3.1.0" tor-hash-passwd = "1.0.1" diff --git a/infrastructure/storage/Cargo.toml b/infrastructure/storage/Cargo.toml index cf788177d6..afafd67bd6 100644 --- a/infrastructure/storage/Cargo.toml +++ b/infrastructure/storage/Cargo.toml @@ -15,7 +15,6 @@ log = "0.4.0" lmdb-zero = "0.4.4" thiserror = "1.0.26" serde = "1.0.80" -serde_derive = "1.0.80" [dev-dependencies] rand = "0.7.3" diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 38a72b6b1a..a3c4f6a2c4 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -22,7 +22,6 @@ tari_miner = { path = "../applications/tari_miner" } tari_p2p = { path = "../base_layer/p2p" } tari_script = { path = "../infrastructure/tari_script" } tari_shutdown = { path = "../infrastructure/shutdown" } -tari_test_utils = { path = "../infrastructure/test_utils" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10"} tari_wallet = { path = "../base_layer/wallet" } tari_wallet_grpc_client = { path = "../clients/rust/wallet_grpc_client" } @@ -30,39 +29,19 @@ tari_wallet_ffi = { path = "../base_layer/wallet_ffi" } anyhow = "1.0.53" async-trait = "0.1.50" -axum = "0.6.0" -axum-jrpc = { version = "0.3.2", features = ["anyhow_error"] } -bincode = "1.3.3" -blake2 = "0.9.2" -borsh = { version = "0.9.3", default-features = false } -bytes = "1" chrono = "0.4.22" -clap = { version = "3.2.5", features = ["env"] } config = "0.13.0" csv = "1.1" -digest = "0.9.0" -diesel = { version = "1.4.8", default-features = false, features = ["sqlite"] } futures = { version = "^0.3.1" } -include_dir = "0.7.2" -json5 = "0.2.2" libc = "0.2.65" -libsqlite3-sys = { version = "0.22.2", features = ["bundled"] } -lmdb-zero = "0.4.4" log = { version = "0.4.8", features = ["std"] } -log4rs = { version = "1.1.1", features = ["rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] } -prost = "0.9" rand = "0.7" reqwest = "0.11.11" -serde = { version = "1.0.126", features = ["derive"] } serde_json = "1.0.64" thiserror = "^1.0.20" time = "0.3.15" tokio = { version = "1.10", features = ["macros", "time", "sync", "rt-multi-thread"] } -tokio-stream = { version = "0.1.7", features = ["sync"] } tonic = "0.6.2" -tower = "0.4" -tower-http = { version = "0.3.0", features = ["cors"] } -tower-layer = "0.3" [dev-dependencies] @@ -74,6 +53,10 @@ cucumber = { version = "0.18.0", features = ["default", "libtest"] } tempfile = "3.3.0" indexmap = "1.9.1" +[package.metadata.cargo-machete] +ignored = ["tari_wallet_ffi"] + [[test]] name = "cucumber" # this should be the same as the filename of your test target harness = false # allows Cucumber to print output instead of libtest +