zcash_primitives: Rename Note::cm to Note::cmu
This commit is contained in:
parent
7a6223202e
commit
d15acf8acc
|
@ -263,7 +263,7 @@ mod tests {
|
||||||
Memo::default(),
|
Memo::default(),
|
||||||
&mut rng,
|
&mut rng,
|
||||||
);
|
);
|
||||||
let cmu = note.cm().to_repr().as_ref().to_owned();
|
let cmu = note.cmu().to_repr().as_ref().to_owned();
|
||||||
let epk = encryptor.epk().to_bytes().to_vec();
|
let epk = encryptor.epk().to_bytes().to_vec();
|
||||||
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,7 @@ mod tests {
|
||||||
Memo::default(),
|
Memo::default(),
|
||||||
&mut rng,
|
&mut rng,
|
||||||
);
|
);
|
||||||
let cmu = note.cm().to_repr().as_ref().to_vec();
|
let cmu = note.cmu().to_repr().as_ref().to_vec();
|
||||||
let epk = encryptor.epk().to_bytes().to_vec();
|
let epk = encryptor.epk().to_bytes().to_vec();
|
||||||
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
||||||
|
|
||||||
|
@ -199,7 +199,7 @@ mod tests {
|
||||||
Memo::default(),
|
Memo::default(),
|
||||||
&mut rng,
|
&mut rng,
|
||||||
);
|
);
|
||||||
let cmu = note.cm().to_repr().as_ref().to_vec();
|
let cmu = note.cmu().to_repr().as_ref().to_vec();
|
||||||
let epk = encryptor.epk().to_bytes().to_vec();
|
let epk = encryptor.epk().to_bytes().to_vec();
|
||||||
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
||||||
|
|
||||||
|
@ -227,7 +227,7 @@ mod tests {
|
||||||
Memo::default(),
|
Memo::default(),
|
||||||
&mut rng,
|
&mut rng,
|
||||||
);
|
);
|
||||||
let cmu = note.cm().to_repr().as_ref().to_vec();
|
let cmu = note.cmu().to_repr().as_ref().to_vec();
|
||||||
let epk = encryptor.epk().to_bytes().to_vec();
|
let epk = encryptor.epk().to_bytes().to_vec();
|
||||||
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
||||||
|
|
||||||
|
|
|
@ -212,7 +212,7 @@ pub fn prf_ock(
|
||||||
/// };
|
/// };
|
||||||
/// let rcm = jubjub::Fr::random(&mut rng);
|
/// let rcm = jubjub::Fr::random(&mut rng);
|
||||||
/// let note = to.create_note(value, Rseed::BeforeZip212(rcm)).unwrap();
|
/// let note = to.create_note(value, Rseed::BeforeZip212(rcm)).unwrap();
|
||||||
/// let cmu = note.cm();
|
/// let cmu = note.cmu();
|
||||||
///
|
///
|
||||||
/// let enc = SaplingNoteEncryption::new(ovk, note, to, Memo::default(), &mut rng);
|
/// let enc = SaplingNoteEncryption::new(ovk, note, to, Memo::default(), &mut rng);
|
||||||
/// let encCiphertext = enc.encrypt_note_plaintext();
|
/// let encCiphertext = enc.encrypt_note_plaintext();
|
||||||
|
@ -354,7 +354,7 @@ fn parse_note_plaintext_without_memo<P: consensus::Parameters>(
|
||||||
let to = PaymentAddress::from_parts(diversifier, pk_d)?;
|
let to = PaymentAddress::from_parts(diversifier, pk_d)?;
|
||||||
let note = to.create_note(v, rseed).unwrap();
|
let note = to.create_note(v, rseed).unwrap();
|
||||||
|
|
||||||
if note.cm() != *cmu {
|
if note.cmu() != *cmu {
|
||||||
// Published commitment doesn't match calculated commitment
|
// Published commitment doesn't match calculated commitment
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
@ -552,7 +552,7 @@ pub fn try_sapling_output_recovery_with_ock<P: consensus::Parameters>(
|
||||||
let to = PaymentAddress::from_parts(diversifier, pk_d)?;
|
let to = PaymentAddress::from_parts(diversifier, pk_d)?;
|
||||||
let note = to.create_note(v, rseed).unwrap();
|
let note = to.create_note(v, rseed).unwrap();
|
||||||
|
|
||||||
if note.cm() != *cmu {
|
if note.cmu() != *cmu {
|
||||||
// Published commitment doesn't match calculated commitment
|
// Published commitment doesn't match calculated commitment
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
@ -825,7 +825,7 @@ mod tests {
|
||||||
let rseed = generate_random_rseed::<TestNetwork, R>(height, &mut rng);
|
let rseed = generate_random_rseed::<TestNetwork, R>(height, &mut rng);
|
||||||
|
|
||||||
let note = pa.create_note(value, rseed).unwrap();
|
let note = pa.create_note(value, rseed).unwrap();
|
||||||
let cmu = note.cm();
|
let cmu = note.cmu();
|
||||||
|
|
||||||
let ovk = OutgoingViewingKey([0; 32]);
|
let ovk = OutgoingViewingKey([0; 32]);
|
||||||
let ne = SaplingNoteEncryption::new(ovk, note, pa, Memo([0; 512]), &mut rng);
|
let ne = SaplingNoteEncryption::new(ovk, note, pa, Memo([0; 512]), &mut rng);
|
||||||
|
@ -1781,7 +1781,7 @@ mod tests {
|
||||||
|
|
||||||
let to = PaymentAddress::from_parts(Diversifier(tv.default_d), pk_d).unwrap();
|
let to = PaymentAddress::from_parts(Diversifier(tv.default_d), pk_d).unwrap();
|
||||||
let note = to.create_note(tv.v, Rseed::BeforeZip212(rcm)).unwrap();
|
let note = to.create_note(tv.v, Rseed::BeforeZip212(rcm)).unwrap();
|
||||||
assert_eq!(note.cm(), cmu);
|
assert_eq!(note.cmu(), cmu);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Test decryption
|
// Test decryption
|
||||||
|
|
|
@ -276,7 +276,7 @@ impl Note {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Computes the note commitment
|
/// Computes the note commitment
|
||||||
pub fn cm(&self) -> bls12_381::Scalar {
|
pub fn cmu(&self) -> bls12_381::Scalar {
|
||||||
// The commitment is in the prime order subgroup, so mapping the
|
// The commitment is in the prime order subgroup, so mapping the
|
||||||
// commitment to the u-coordinate is an injective encoding.
|
// commitment to the u-coordinate is an injective encoding.
|
||||||
jubjub::ExtendedPoint::from(self.cm_full_point())
|
jubjub::ExtendedPoint::from(self.cm_full_point())
|
||||||
|
|
|
@ -138,7 +138,7 @@ impl SaplingOutput {
|
||||||
self.note.value,
|
self.note.value,
|
||||||
);
|
);
|
||||||
|
|
||||||
let cmu = self.note.cm();
|
let cmu = self.note.cmu();
|
||||||
|
|
||||||
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
let enc_ciphertext = encryptor.encrypt_note_plaintext();
|
||||||
let out_ciphertext = encryptor.encrypt_outgoing_plaintext(&cv, &cmu);
|
let out_ciphertext = encryptor.encrypt_outgoing_plaintext(&cv, &cmu);
|
||||||
|
@ -368,7 +368,7 @@ impl<P: consensus::Parameters, R: RngCore + CryptoRng> Builder<P, R> {
|
||||||
merkle_path: MerklePath<Node>,
|
merkle_path: MerklePath<Node>,
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
// Consistency check: all anchors must equal the first one
|
// Consistency check: all anchors must equal the first one
|
||||||
let cm = Node::new(note.cm().into());
|
let cm = Node::new(note.cmu().into());
|
||||||
if let Some(anchor) = self.anchor {
|
if let Some(anchor) = self.anchor {
|
||||||
let path_root: bls12_381::Scalar = merkle_path.root(cm).into();
|
let path_root: bls12_381::Scalar = merkle_path.root(cm).into();
|
||||||
if path_root != anchor {
|
if path_root != anchor {
|
||||||
|
@ -635,7 +635,7 @@ impl<P: consensus::Parameters, R: RngCore + CryptoRng> Builder<P, R> {
|
||||||
dummy_note.value,
|
dummy_note.value,
|
||||||
);
|
);
|
||||||
|
|
||||||
let cmu = dummy_note.cm();
|
let cmu = dummy_note.cmu();
|
||||||
|
|
||||||
let mut enc_ciphertext = [0u8; 580];
|
let mut enc_ciphertext = [0u8; 580];
|
||||||
let mut out_ciphertext = [0u8; 80];
|
let mut out_ciphertext = [0u8; 80];
|
||||||
|
@ -780,9 +780,9 @@ mod tests {
|
||||||
let note1 = to
|
let note1 = to
|
||||||
.create_note(50000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
|
.create_note(50000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let cm1 = Node::new(note1.cm().to_repr());
|
let cmu1 = Node::new(note1.cmu().to_repr());
|
||||||
let mut tree = CommitmentTree::new();
|
let mut tree = CommitmentTree::new();
|
||||||
tree.append(cm1).unwrap();
|
tree.append(cmu1).unwrap();
|
||||||
let witness1 = IncrementalWitness::from_tree(&tree);
|
let witness1 = IncrementalWitness::from_tree(&tree);
|
||||||
|
|
||||||
let mut builder = Builder::<TestNetwork, OsRng>::new(0);
|
let mut builder = Builder::<TestNetwork, OsRng>::new(0);
|
||||||
|
@ -879,9 +879,9 @@ mod tests {
|
||||||
let note1 = to
|
let note1 = to
|
||||||
.create_note(59999, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
|
.create_note(59999, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let cm1 = Node::new(note1.cm().to_repr());
|
let cmu1 = Node::new(note1.cmu().to_repr());
|
||||||
let mut tree = CommitmentTree::new();
|
let mut tree = CommitmentTree::new();
|
||||||
tree.append(cm1).unwrap();
|
tree.append(cmu1).unwrap();
|
||||||
let mut witness1 = IncrementalWitness::from_tree(&tree);
|
let mut witness1 = IncrementalWitness::from_tree(&tree);
|
||||||
|
|
||||||
// Fail if there is insufficient input
|
// Fail if there is insufficient input
|
||||||
|
@ -919,9 +919,9 @@ mod tests {
|
||||||
let note2 = to
|
let note2 = to
|
||||||
.create_note(1, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
|
.create_note(1, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let cm2 = Node::new(note2.cm().to_repr());
|
let cmu2 = Node::new(note2.cmu().to_repr());
|
||||||
tree.append(cm2).unwrap();
|
tree.append(cmu2).unwrap();
|
||||||
witness1.append(cm2).unwrap();
|
witness1.append(cmu2).unwrap();
|
||||||
let witness2 = IncrementalWitness::from_tree(&tree);
|
let witness2 = IncrementalWitness::from_tree(&tree);
|
||||||
|
|
||||||
// Succeeds if there is sufficient input
|
// Succeeds if there is sufficient input
|
||||||
|
|
|
@ -576,7 +576,7 @@ fn test_input_circuit_with_bls12_381() {
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut position = 0u64;
|
let mut position = 0u64;
|
||||||
let cm = note.cm();
|
let cm = note.cmu();
|
||||||
let mut cur = cm.clone();
|
let mut cur = cm.clone();
|
||||||
|
|
||||||
for (i, val) in auth_path.clone().into_iter().enumerate() {
|
for (i, val) in auth_path.clone().into_iter().enumerate() {
|
||||||
|
@ -757,7 +757,7 @@ fn test_input_circuit_with_bls12_381_external_test_vectors() {
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut position = 0u64;
|
let mut position = 0u64;
|
||||||
let cm = note.cm();
|
let cm = note.cmu();
|
||||||
let mut cur = cm.clone();
|
let mut cur = cm.clone();
|
||||||
|
|
||||||
for (i, val) in auth_path.clone().into_iter().enumerate() {
|
for (i, val) in auth_path.clone().into_iter().enumerate() {
|
||||||
|
@ -910,7 +910,7 @@ fn test_output_circuit_with_bls12_381() {
|
||||||
Rseed::BeforeZip212(commitment_randomness),
|
Rseed::BeforeZip212(commitment_randomness),
|
||||||
)
|
)
|
||||||
.expect("should be valid")
|
.expect("should be valid")
|
||||||
.cm();
|
.cmu();
|
||||||
|
|
||||||
let expected_value_cm = jubjub::ExtendedPoint::from(value_commitment.cm()).to_affine();
|
let expected_value_cm = jubjub::ExtendedPoint::from(value_commitment.cm()).to_affine();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue