Remove `bridgetree` dependency from `zcash_primitives`.
This also now makes `zcash_extensions` use `incrementalmerkletree` transitively via type aliases in `zcash_primitives`.
This commit is contained in:
parent
c9f53ddde5
commit
ec29836df9
|
@ -15,7 +15,6 @@ zcash_primitives = { version = "0.11", path = "../zcash_primitives", default-fea
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
ff = "0.13"
|
ff = "0.13"
|
||||||
incrementalmerkletree = { version = "0.3", features = ["legacy-api"] }
|
|
||||||
jubjub = "0.10"
|
jubjub = "0.10"
|
||||||
rand_core = "0.6"
|
rand_core = "0.6"
|
||||||
zcash_address = { version = "0.2", path = "../components/zcash_address" }
|
zcash_address = { version = "0.2", path = "../components/zcash_address" }
|
||||||
|
|
|
@ -478,7 +478,6 @@ impl<'a, B: ExtensionTxBuilder<'a>> DemoBuilder<B> {
|
||||||
mod tests {
|
mod tests {
|
||||||
use blake2b_simd::Params;
|
use blake2b_simd::Params;
|
||||||
use ff::Field;
|
use ff::Field;
|
||||||
use incrementalmerkletree::{frontier::CommitmentTree, witness::IncrementalWitness};
|
|
||||||
use rand_core::OsRng;
|
use rand_core::OsRng;
|
||||||
|
|
||||||
use zcash_primitives::{
|
use zcash_primitives::{
|
||||||
|
@ -486,7 +485,7 @@ mod tests {
|
||||||
constants,
|
constants,
|
||||||
extensions::transparent::{self as tze, Extension, FromPayload, ToPayload},
|
extensions::transparent::{self as tze, Extension, FromPayload, ToPayload},
|
||||||
legacy::TransparentAddress,
|
legacy::TransparentAddress,
|
||||||
sapling::{Node, Rseed},
|
sapling::{self, Node, Rseed},
|
||||||
transaction::{
|
transaction::{
|
||||||
builder::Builder,
|
builder::Builder,
|
||||||
components::{
|
components::{
|
||||||
|
@ -815,11 +814,11 @@ mod tests {
|
||||||
let to = extsk.default_address().1;
|
let to = extsk.default_address().1;
|
||||||
let note1 = to.create_note(101000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)));
|
let note1 = to.create_note(101000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)));
|
||||||
let cm1 = Node::from_cmu(¬e1.cmu());
|
let cm1 = Node::from_cmu(¬e1.cmu());
|
||||||
let mut tree = CommitmentTree::empty();
|
let mut tree = sapling::CommitmentTree::empty();
|
||||||
// fake that the note appears in some previous
|
// fake that the note appears in some previous
|
||||||
// shielded output
|
// shielded output
|
||||||
tree.append(cm1).unwrap();
|
tree.append(cm1).unwrap();
|
||||||
let witness1 = IncrementalWitness::from_tree(tree);
|
let witness1 = sapling::IncrementalWitness::from_tree(tree);
|
||||||
|
|
||||||
let mut builder_a = demo_builder(tx_height);
|
let mut builder_a = demo_builder(tx_height);
|
||||||
builder_a
|
builder_a
|
||||||
|
|
|
@ -47,7 +47,6 @@ nonempty = "0.7"
|
||||||
orchard = { version = "0.4", default-features = false }
|
orchard = { version = "0.4", default-features = false }
|
||||||
|
|
||||||
# - Note Commitment Trees
|
# - Note Commitment Trees
|
||||||
bridgetree = "0.2"
|
|
||||||
incrementalmerkletree = { version = "0.3", features = ["legacy-api"] }
|
incrementalmerkletree = { version = "0.3", features = ["legacy-api"] }
|
||||||
|
|
||||||
# - Static constants
|
# - Static constants
|
||||||
|
|
Loading…
Reference in New Issue