From 06687321e419ac71fcb7d7b81fa69298ce517b68 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 20 Sep 2024 16:27:46 -0600
Subject: [PATCH 1/2] zcash_client_sqlite: Fix bad `WalletTest` import that
 breaks downstream builds.

---
 zcash_client_sqlite/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index a7b5a277a..e24a9a717 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -53,7 +53,7 @@ use zcash_client_backend::{
         Account, AccountBirthday, AccountPurpose, AccountSource, BlockMetadata,
         DecryptedTransaction, InputSource, NullifierQuery, ScannedBlock, SeedRelevance,
         SentTransaction, SpendableNotes, TransactionDataRequest, WalletCommitmentTrees, WalletRead,
-        WalletSummary, WalletTest, WalletWrite, SAPLING_SHARD_HEIGHT,
+        WalletSummary, WalletWrite, SAPLING_SHARD_HEIGHT,
     },
     keys::{
         AddressGenerationError, UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedSpendingKey,
@@ -99,7 +99,7 @@ use maybe_rayon::{
 };
 
 #[cfg(any(test, feature = "test-dependencies"))]
-use zcash_client_backend::data_api::testing::TransactionSummary;
+use zcash_client_backend::data_api::{testing::TransactionSummary, WalletTest};
 
 /// `maybe-rayon` doesn't provide this as a fallback, so we have to.
 #[cfg(not(feature = "multicore"))]

From 176c0cb805c44ed85216ea6ce8f05b93bb3f3d42 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 20 Sep 2024 16:42:04 -0600
Subject: [PATCH 2/2] Update base64 to 0.22 to eliminate duplicate dependency.

---
 Cargo.lock | 16 +++++-----------
 Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c81d21f8b..2be9cae1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -438,12 +438,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -3566,7 +3560,7 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "rustls-pki-types",
 ]
 
@@ -3837,7 +3831,7 @@ version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
@@ -4433,7 +4427,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "flate2",
  "h2",
@@ -5833,7 +5827,7 @@ dependencies = [
  "arti-client",
  "assert_matches",
  "async-trait",
- "base64 0.21.7",
+ "base64",
  "bech32",
  "bip32",
  "bls12_381",
@@ -6156,7 +6150,7 @@ dependencies = [
 name = "zip321"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "nom",
  "percent-encoding",
  "proptest",
diff --git a/Cargo.toml b/Cargo.toml
index c441bdac4..f44d5087a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ sha2 = "0.10"
 document-features = "0.2"
 
 # Encodings
-base64 = "0.21"
+base64 = "0.22"
 bech32 = "0.9"
 bs58 = { version = "0.5", features = ["check"] }
 byteorder = "1"