From 587e1fa60b4d408cfb3762fced23e8b620a71532 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 3 Nov 2022 05:02:39 +0000
Subject: [PATCH] Fix clippy lints related to `prost` API usage

---
 zcash_client_backend/src/welding_rig.rs | 14 +++++++-----
 zcash_client_sqlite/src/lib.rs          | 29 ++++++++++++++++---------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/zcash_client_backend/src/welding_rig.rs b/zcash_client_backend/src/welding_rig.rs
index 22a0056ed..09cf89fba 100644
--- a/zcash_client_backend/src/welding_rig.rs
+++ b/zcash_client_backend/src/welding_rig.rs
@@ -507,13 +507,15 @@ mod tests {
         let enc_ciphertext = encryptor.encrypt_note_plaintext();
 
         // Create a fake CompactBlock containing the note
-        let mut cb = CompactBlock::default();
-        cb.hash = {
-            let mut hash = vec![0; 32];
-            rng.fill_bytes(&mut hash);
-            hash
+        let mut cb = CompactBlock {
+            hash: {
+                let mut hash = vec![0; 32];
+                rng.fill_bytes(&mut hash);
+                hash
+            },
+            height: height.into(),
+            ..Default::default()
         };
-        cb.height = height.into();
 
         // Add a random Sapling tx before ours
         {
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index f097f8725..ec06bddfd 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1059,10 +1059,15 @@ mod tests {
         rng.fill_bytes(&mut txid);
         ctx.hash = txid;
         ctx.outputs.push(cout);
-        let mut cb = CompactBlock::default();
-        cb.height = u64::from(height);
-        cb.hash.resize(32, 0);
-        rng.fill_bytes(&mut cb.hash);
+        let mut cb = CompactBlock {
+            hash: {
+                let mut hash = vec![0; 32];
+                rng.fill_bytes(&mut hash);
+                hash
+            },
+            height: height.into(),
+            ..Default::default()
+        };
         cb.prev_hash.extend_from_slice(&prev_hash.0);
         cb.vtx.push(ctx);
         (cb, note.nf(&dfvk.fvk().vk.nk, 0))
@@ -1082,8 +1087,7 @@ mod tests {
         let rseed = generate_random_rseed(&network(), height, &mut rng);
 
         // Create a fake CompactBlock containing the note
-        let mut cspend = CompactSaplingSpend::default();
-        cspend.nf = nf.to_vec();
+        let cspend = CompactSaplingSpend { nf: nf.to_vec() };
         let mut ctx = CompactTx::default();
         let mut txid = vec![0; 32];
         rng.fill_bytes(&mut txid);
@@ -1144,10 +1148,15 @@ mod tests {
             }
         });
 
-        let mut cb = CompactBlock::default();
-        cb.height = u64::from(height);
-        cb.hash.resize(32, 0);
-        rng.fill_bytes(&mut cb.hash);
+        let mut cb = CompactBlock {
+            hash: {
+                let mut hash = vec![0; 32];
+                rng.fill_bytes(&mut hash);
+                hash
+            },
+            height: height.into(),
+            ..Default::default()
+        };
         cb.prev_hash.extend_from_slice(&prev_hash.0);
         cb.vtx.push(ctx);
         cb