Move CommitmentTreeWitness into zcash_primitives

This commit is contained in:
Jack Grigg
2018-11-09 00:07:25 +13:00
parent f4059a5faa
commit bf74915053
7 changed files with 83 additions and 78 deletions

View File

@@ -57,13 +57,14 @@ use std::os::windows::ffi::OsStringExt;
use sapling_crypto::primitives::{ProofGenerationKey, ViewingKey};
use zcash_primitives::{
merkle_tree::CommitmentTreeWitness,
note_encryption::sapling_ka_agree,
sapling::{merkle_hash, spend_sig},
zip32, JUBJUB,
};
use zcash_proofs::{
load_parameters,
sapling::{CommitmentTreeWitness, SaplingProvingContext, SaplingVerificationContext},
sapling::{SaplingProvingContext, SaplingVerificationContext},
};
pub mod equihash;