feat: remove unused dependencies (#5144)

* remove unused * remove unused from cucumber * added in ignore for wallet_ffi --------- Co-authored-by: Cayle Sharrock <[email protected]>
tari-project · Jan 31, 2023 · a9d0f37 · a9d0f37
1 parent 5981459
commit a9d0f37
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 268 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -22,47 +22,26 @@ 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" }
 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
+