From d4fce580193ee1b177910af63347bebe524259e8 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Wed, 5 Jun 2019 14:19:50 +0100
Subject: [PATCH] Tweaks to debug output and function names

---
 zcash_primitives/src/note_encryption.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zcash_primitives/src/note_encryption.rs b/zcash_primitives/src/note_encryption.rs
index fe1463f..313a02f 100644
--- a/zcash_primitives/src/note_encryption.rs
+++ b/zcash_primitives/src/note_encryption.rs
@@ -67,7 +67,7 @@ impl fmt::Debug for Memo {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Memo(")?;
         match self.to_utf8() {
-            Some(Ok(memo)) => write!(f, "{}", memo)?,
+            Some(Ok(memo)) => write!(f, "\"{}\"", memo)?,
             _ => fmt_colon_delimited_hex(f, &self.0[..])?,
         }
         write!(f, ")")
@@ -347,7 +347,7 @@ impl SaplingNoteEncryption {
     }
 }
 
-fn parse_note_plaintext_minus_memo(
+fn parse_note_plaintext_without_memo(
     ivk: &Fs,
     cmu: &Fr,
     plaintext: &[u8],
@@ -409,7 +409,7 @@ pub fn try_sapling_note_decryption(
         NOTE_PLAINTEXT_SIZE
     );
 
-    let (note, to) = parse_note_plaintext_minus_memo(ivk, cmu, &plaintext)?;
+    let (note, to) = parse_note_plaintext_without_memo(ivk, cmu, &plaintext)?;
 
     let mut memo = [0u8; 512];
     memo.copy_from_slice(&plaintext[COMPACT_NOTE_SIZE..NOTE_PLAINTEXT_SIZE]);
@@ -454,7 +454,7 @@ pub fn try_sapling_compact_note_decryption(
         CHACHA20_BLOCK_SIZE + COMPACT_NOTE_SIZE
     );
 
-    parse_note_plaintext_minus_memo(ivk, cmu, &plaintext[CHACHA20_BLOCK_SIZE..])
+    parse_note_plaintext_without_memo(ivk, cmu, &plaintext[CHACHA20_BLOCK_SIZE..])
 }
 
 /// Recovery of the full note plaintext by the sender.