fix: chat build (#6026)

Description --- fixes the chat ffi build adds CI option to build chat ffi.
tari-project · Dec 8, 2023 · 15793b7 · 15793b7
1 parent 93c25f4
commit 15793b7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -144,8 +144,10 @@ jobs:
         run: rustup show
       - name: cargo check
         run: cargo check --release --all-targets --workspace --exclude tari_integration_tests --locked
-      - name: cargo check ffi separately
+      - name: cargo check wallet ffi separately
         run: cargo check --release --package minotari_wallet_ffi --locked
+      - name: cargo check chat ffi separately
+        run: cargo check --release --package minotari_chat_ffi --locked
   licenses:
     name: file licenses
     runs-on: [ubuntu-20.04]

diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8"
 rcgen = "0.11.3"
 subtle = { version = "2.5.0", features = ["core_hint_black_box"] }
 thiserror = "1"
-tokio = "1.23"
+tokio = {  version = "1.23" , features = ["fs"]}
 tonic = "0.6.2"
 zeroize = "1"
 

diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml
@@ -11,7 +11,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_features = { path = "../../common/tari_features"}
 tari_utilities = { version = "0.7" }
-minotari_app_grpc = { path = "../minotari_app_grpc" }
+minotari_app_grpc = { path = "../minotari_app_grpc" , optional = true}
 
 clap = { version = "3.2", features = ["derive", "env"] }
 futures = { version = "^0.3.16", default-features = false, features = ["alloc"] }
@@ -28,3 +28,6 @@ tonic = "0.6.2"
 [build-dependencies]
 tari_common = { path = "../../common", features = ["build", "static-application-info"] }
 tari_features = { path = "../../common/tari_features"}
+
+[features]
+miner_input = ["minotari_app_grpc"]
diff --git a/applications/minotari_app_utilities/src/lib.rs b/applications/minotari_app_utilities/src/lib.rs
@@ -23,6 +23,7 @@
 pub mod common_cli_args;
 pub mod identity_management;
 pub mod network_check;
+#[cfg(feature = "miner_input")]
 pub mod parse_miner_input;
 pub mod utilities;
 

diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml
@@ -15,7 +15,7 @@ tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
-minotari_app_utilities = { path = "../minotari_app_utilities" }
+minotari_app_utilities = { path = "../minotari_app_utilities", features = ["miner_input"] }
 tari_utilities = { version = "0.7" }
 minotari_node_grpc_client = { path = "../../clients/rust/base_node_grpc_client" }
 minotari_wallet_grpc_client = { path = "../../clients/rust/wallet_grpc_client" }

diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml
@@ -12,7 +12,7 @@ tari_core = { path = "../../base_layer/core", default-features = false }
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
-minotari_app_utilities = { path = "../minotari_app_utilities" }
+minotari_app_utilities = { path = "../minotari_app_utilities", features = ["miner_input"] }
 minotari_app_grpc = { path = "../minotari_app_grpc" }
 tari_crypto = { version = "0.20" }
 tari_utilities = { version = "0.7" }