diff --git a/Cargo.lock b/Cargo.lock index b840f5953d3..d852f6ce84f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5260,45 +5260,31 @@ dependencies = [ "diesel", "lmdb-zero", "log", - "tari_common", "tari_common_sqlite", "tari_common_types", "tari_comms", - "tari_comms_dht", "tari_contacts", "tari_p2p", "tari_service_framework", "tari_shutdown", "tari_storage", "tari_test_utils", - "tokio", ] [[package]] name = "tari_chat_ffi" version = "0.50.0-pre.0" dependencies = [ - "anyhow", "cbindgen 0.24.3", - "diesel", "libc", - "lmdb-zero", - "log", "openssl", - "rand 0.7.3", "serde_json", "tari_chat_client", "tari_common", - "tari_common_sqlite", "tari_common_types", "tari_comms", - "tari_comms_dht", "tari_contacts", "tari_p2p", - "tari_service_framework", - "tari_shutdown", - "tari_storage", - "tari_test_utils", "tokio", ] @@ -5673,7 +5659,6 @@ dependencies = [ "tari_chat_client", "tari_chat_ffi", "tari_common", - "tari_common_sqlite", "tari_common_types", "tari_comms", "tari_comms_dht", diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml index a6143d76e64..66b07cb9fe6 100644 --- a/base_layer/chat_ffi/Cargo.toml +++ b/base_layer/chat_ffi/Cargo.toml @@ -9,23 +9,12 @@ edition = "2018" [dependencies] tari_chat_client = { path = "../contacts/examples/chat_client" } tari_common = { path = "../../common" } -tari_common_sqlite = { path = "../../common_sqlite" } tari_common_types = { path = "../common_types" } tari_comms = { path = "../../comms/core" } -tari_comms_dht = { path = "../../comms/dht" } tari_contacts = { path = "../contacts" } tari_p2p = { path = "../p2p" } -tari_service_framework= { path = "../service_framework" } -tari_shutdown = { path = "../../infrastructure/shutdown" } -tari_storage = { path = "../../infrastructure/storage" } -tari_test_utils = { path = "../../infrastructure/test_utils" } -anyhow = "1.0.41" -diesel = { version = "2.0.3", features = ["sqlite", "r2d2", "serde_json", "chrono", "64-column-tables"] } libc = "0.2.65" -lmdb-zero = "0.4.4" -log = "0.4.17" -rand = "0.7" serde_json = "1.0.64" tokio = "1.23" diff --git a/base_layer/chat_ffi/build.rs b/base_layer/chat_ffi/build.rs index cc7330324c6..d6cf676c714 100644 --- a/base_layer/chat_ffi/build.rs +++ b/base_layer/chat_ffi/build.rs @@ -45,14 +45,3 @@ fn main() { .unwrap() .write_to_file(output_file); } - -// /// Find the location of the `target/` directory. Note that this may be -// /// overridden by `cmake`, so we also need to check the `CARGO_TARGET_DIR` -// /// variable. -// fn target_dir() -> PathBuf { -// if let Ok(target) = env::var("CARGO_TARGET_DIR") { -// PathBuf::from(target) -// } else { -// PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("target") -// } -// } diff --git a/base_layer/contacts/examples/chat_client/Cargo.toml b/base_layer/contacts/examples/chat_client/Cargo.toml index 30146011866..98537eff4c6 100644 --- a/base_layer/contacts/examples/chat_client/Cargo.toml +++ b/base_layer/contacts/examples/chat_client/Cargo.toml @@ -8,11 +8,9 @@ version = "0.50.0-pre.0" edition = "2018" [dependencies] -tari_common = { path = "../../../../common" } tari_common_types = { path = "../../../common_types" } tari_common_sqlite = { path = "../../../../common_sqlite" } tari_comms = { path = "../../../../comms/core" } -tari_comms_dht = { path = "../../../../comms/dht" } tari_contacts = { path = "../../../contacts" } tari_p2p = { path = "../../../p2p" } tari_service_framework= { path = "../../../service_framework" } @@ -25,4 +23,3 @@ async-trait = "0.1.52" diesel = { version = "2.0.3", features = ["sqlite", "r2d2", "serde_json", "chrono", "64-column-tables"] } lmdb-zero = "0.4.4" log = "0.4.17" -tokio = "1.23" diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 8ab0803fcf9..338788aef45 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -15,7 +15,6 @@ tari_chat_client = { path = "../base_layer/contacts/examples/chat_client" } tari_chat_ffi = { path = "../base_layer/chat_ffi" } tari_crypto = "0.16.12" tari_common = { path = "../common" } -tari_common_sqlite = { path = "../common_sqlite" } tari_common_types = { path = "../base_layer/common_types" } tari_comms = { path = "../comms/core" } tari_comms_dht = { path = "../comms/dht" } @@ -52,7 +51,7 @@ tokio = { version = "1.10", features = ["macros", "time", "sync", "rt-multi-thre tonic = "0.6.2" [package.metadata.cargo-machete] -ignored = ["tari_wallet_ffi"] +ignored = ["tari_wallet_ffi", "tari_chat_ffi"] [[test]] name = "cucumber" # this should be the same as the filename of your test target