From b7bba9bbb2dba1ecceaa1b4ea5eab353648a2c83 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 14 Dec 2023 18:17:20 +0000
Subject: [PATCH] zcash_primitives: Remove `keys` module

---
 zcash_client_backend/src/decrypt.rs | 2 +-
 zcash_primitives/CHANGELOG.md       | 4 +++-
 zcash_primitives/src/keys.rs        | 1 -
 zcash_primitives/src/lib.rs         | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 zcash_primitives/src/keys.rs

diff --git a/zcash_client_backend/src/decrypt.rs b/zcash_client_backend/src/decrypt.rs
index 3cbae49ab..62c1fb8bd 100644
--- a/zcash_client_backend/src/decrypt.rs
+++ b/zcash_client_backend/src/decrypt.rs
@@ -41,7 +41,7 @@ pub struct DecryptedOutput<Note> {
     /// True if this output was recovered using an [`OutgoingViewingKey`], meaning that
     /// this is a logical output of the transaction.
     ///
-    /// [`OutgoingViewingKey`]: zcash_primitives::keys::OutgoingViewingKey
+    /// [`OutgoingViewingKey`]: sapling::keys::OutgoingViewingKey
     pub transfer_type: TransferType,
 }
 
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 441e178bc..6cc4d3090 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -110,8 +110,10 @@ and this library adheres to Rust's notion of
 ### Removed
 - `zcash_primitives::constants`:
   - All `const` values (moved to `sapling_crypto::constants`).
-- `zcash_primitives::keys`:
+- `zcash_primitives::keys` module, as it was empty after the removal of:
   - `PRF_EXPAND_PERSONALIZATION`
+  - `OutgoingViewingKey` (use `sapling_crypto::keys::OutgoingViewingKey`
+    instead).
   - `prf_expand, prf_expand_vec` (use `zcash_spec::PrfExpand` instead).
 - `zcash_primitives::sapling` module (use the `sapling-crypto` crate instead).
 - `zcash_primitives::transaction::components::sapling`:
diff --git a/zcash_primitives/src/keys.rs b/zcash_primitives/src/keys.rs
deleted file mode 100644
index c263127ba..000000000
--- a/zcash_primitives/src/keys.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub use crate::sapling::keys::OutgoingViewingKey;
diff --git a/zcash_primitives/src/lib.rs b/zcash_primitives/src/lib.rs
index 17362155b..884bceffc 100644
--- a/zcash_primitives/src/lib.rs
+++ b/zcash_primitives/src/lib.rs
@@ -15,7 +15,6 @@
 pub mod block;
 pub mod consensus;
 pub mod constants;
-pub mod keys;
 pub mod legacy;
 pub mod memo;
 pub mod merkle_tree;