zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix dependencies to repair `cargo -p` subproject builds.

This commit is contained in:
Kris Nuttycombe 2023-11-29 12:34:59 -07:00
parent 79e499ea41
commit 1e5d253c9c
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zcash_client_backend/Cargo.toml
View File

@ -85,6 +85,7 @@ which = "4"
[dev-dependencies] [dev-dependencies]
assert_matches.workspace = true assert_matches.workspace = true
gumdrop = "0.8" gumdrop = "0.8"
incrementalmerkletree = { workspace = true, features = ["test-dependencies"] }
jubjub.workspace = true jubjub.workspace = true
proptest.workspace = true proptest.workspace = true
rand_core.workspace = true rand_core.workspace = true

14
zcash_client_sqlite/src/testing.rs
View File

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

2
zcash_primitives/Cargo.toml
View File

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