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

Apply suggestions from code review 

Co-authored-by: str4d <jack@electriccoin.co>
This commit is contained in:
Kris Nuttycombe 2021-04-05 09:49:32 -06:00 committed by Kris Nuttycombe
parent dad8663c55
commit 879eea863a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/zcash_note_encryption/src/lib.rs
View File

@ -350,8 +350,7 @@ fn parse_note_plaintext_without_memo_ivk<D: Domain>(
) -> Option<(D::Note, D::Recipient)> {
let (note, to) = domain.parse_note_plaintext_without_memo_ivk(ivk, &plaintext)?;
let validity = check_note_validity::<D>(&note, epk, cmstar);
if validity == NoteValidity::Valid {
if let NoteValidity::Valid = check_note_validity::<D>(&note, epk, cmstar) {
Some((note, to))
} else {
None
@ -457,8 +456,7 @@ pub fn try_output_recovery_with_ock<D: Domain>(
let (note, to) = domain.parse_note_plaintext_without_memo_ovk(&pk_d, &esk, &epk, &plaintext)?;
let memo = domain.extract_memo(&plaintext);
let validity = check_note_validity::<D>(&note, epk, cmstar);
if validity == NoteValidity::Valid {
if let NoteValidity::Valid = check_note_validity::<D>(&note, epk, cmstar) {
Some((note, to, memo))
} else {
None

2
zcash_primitives/src/sapling/note_encryption.rs
View File

@ -205,7 +205,7 @@ impl<P: consensus::Parameters> Domain for SaplingDomain<P> {
cmu: &Self::NoteCommitment,
epk: &Self::EphemeralPublicKey,
) -> OutgoingCipherKey {
prf_ock(ovk, &cv, &cmu, epk)
prf_ock(ovk, cv, cmu, epk)
}
fn outgoing_plaintext_bytes(