diff --git a/zcash_extensions/Cargo.toml b/zcash_extensions/Cargo.toml index e7e2e851e..a6afa0295 100644 --- a/zcash_extensions/Cargo.toml +++ b/zcash_extensions/Cargo.toml @@ -15,7 +15,6 @@ zcash_primitives = { version = "0.11", path = "../zcash_primitives", default-fea [dev-dependencies] ff = "0.13" -incrementalmerkletree = { version = "0.3", features = ["legacy-api"] } jubjub = "0.10" rand_core = "0.6" zcash_address = { version = "0.2", path = "../components/zcash_address" } diff --git a/zcash_extensions/src/transparent/demo.rs b/zcash_extensions/src/transparent/demo.rs index 3ac0bbb94..2bd998262 100644 --- a/zcash_extensions/src/transparent/demo.rs +++ b/zcash_extensions/src/transparent/demo.rs @@ -478,7 +478,6 @@ impl<'a, B: ExtensionTxBuilder<'a>> DemoBuilder { mod tests { use blake2b_simd::Params; use ff::Field; - use incrementalmerkletree::{frontier::CommitmentTree, witness::IncrementalWitness}; use rand_core::OsRng; use zcash_primitives::{ @@ -486,7 +485,7 @@ mod tests { constants, extensions::transparent::{self as tze, Extension, FromPayload, ToPayload}, legacy::TransparentAddress, - sapling::{Node, Rseed}, + sapling::{self, Node, Rseed}, transaction::{ builder::Builder, components::{ @@ -815,11 +814,11 @@ mod tests { let to = extsk.default_address().1; let note1 = to.create_note(101000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng))); 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 // shielded output 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); builder_a diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index 59d1c7ef9..b86de7782 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -47,7 +47,6 @@ nonempty = "0.7" orchard = { version = "0.4", default-features = false } # - Note Commitment Trees -bridgetree = "0.2" incrementalmerkletree = { version = "0.3", features = ["legacy-api"] } # - Static constants