Merge pull request #1053 from nuttycom/fix_subproject_builds

Fix dependencies to repair `cargo -p` subproject builds.
zcash · Nov 29, 2023 · 764127f · 764127f
2 parents 79e499e + 1e5d253
commit 764127f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml
@@ -85,6 +85,7 @@ which = "4"
 [dev-dependencies]
 assert_matches.workspace = true
 gumdrop = "0.8"
+incrementalmerkletree = { workspace = true, features = ["test-dependencies"] }
 jubjub.workspace = true
 proptest.workspace = true
 rand_core.workspace = true

diff --git a/zcash_client_sqlite/src/testing.rs b/zcash_client_sqlite/src/testing.rs
@@ -14,6 +14,7 @@ use tempfile::NamedTempFile;
 #[cfg(feature = "unstable")]
 use tempfile::TempDir;
 
+use zcash_client_backend::fees::{standard, DustOutputPolicy};
 #[allow(deprecated)]
 use zcash_client_backend::{
     address::RecipientAddress,
@@ -36,10 +37,6 @@ use zcash_client_backend::{
     wallet::OvkPolicy,
     zip321,
 };
-use zcash_client_backend::{
-    fees::{standard, DustOutputPolicy},
-    proto::proposal,
-};
 use zcash_note_encryption::Domain;
 use zcash_primitives::{
     block::BlockHash,
@@ -74,8 +71,11 @@ use super::BlockDb;
 
 #[cfg(feature = "transparent-inputs")]
 use {
-    zcash_client_backend::data_api::wallet::{
-        input_selection::ShieldingSelector, propose_shielding, shield_transparent_funds,
+    zcash_client_backend::{
+        data_api::wallet::{
+            input_selection::ShieldingSelector, propose_shielding, shield_transparent_funds,
+        },
+        proto::proposal,
     },
     zcash_primitives::legacy::TransparentAddress,
 };
@@ -571,6 +571,7 @@ impl<Cache> TestState<Cache> {
             change_memo,
         );
 
+        #[cfg(feature = "transparent-inputs")]
         if let Ok(proposal) = &result {
             check_proposal_serialization_roundtrip(self.wallet(), proposal);
         }
@@ -1072,6 +1073,7 @@ pub(crate) fn input_selector(
 
 // Checks that a protobuf proposal serialized from the provided proposal value correctly parses to
 // the same proposal value.
+#[cfg(feature = "transparent-inputs")]
 pub(crate) fn check_proposal_serialization_roundtrip(
     db_data: &WalletDb<rusqlite::Connection, Network>,
     proposal: &Proposal<StandardFeeRule, ReceivedNoteId>,

diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
@@ -102,7 +102,7 @@ pprof = { version = "0.11", features = ["criterion", "flamegraph"] } # MSRV 1.56
 
 [features]
 default = ["multicore"]
-multicore = ["orchard/multicore"]
+multicore = ["bellman/multicore", "orchard/multicore"]
 transparent-inputs = ["hdwallet", "ripemd", "secp256k1"]
 temporary-zcashd = []
 test-dependencies = ["proptest", "orchard/test-dependencies"]