From a88d1e89b440f1746f3d85fca6b27ae7c5f46d32 Mon Sep 17 00:00:00 2001
From: kevinheavey <heaveykevin2@gmail.com>
Date: Tue, 5 Nov 2024 13:53:58 +0400
Subject: [PATCH] post-rebase fix

---
 Cargo.lock                                     | 1 +
 zk-token-sdk/Cargo.toml                        | 1 +
 zk-token-sdk/src/encryption/auth_encryption.rs | 5 ++---
 zk-token-sdk/src/encryption/elgamal.rs         | 3 ++-
 zk-token-sdk/src/sigma_proofs/pubkey_proof.rs  | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1536fb5704de7d..cd837c391241c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9132,6 +9132,7 @@ dependencies = [
  "solana-curve25519",
  "solana-derivation-path",
  "solana-instruction",
+ "solana-keypair",
  "solana-pubkey",
  "solana-seed-derivable",
  "solana-seed-phrase",
diff --git a/zk-token-sdk/Cargo.toml b/zk-token-sdk/Cargo.toml
index 39f7e584767b33..cae5ee182fdf14 100644
--- a/zk-token-sdk/Cargo.toml
+++ b/zk-token-sdk/Cargo.toml
@@ -21,6 +21,7 @@ solana-pubkey = { workspace = true, features = ["bytemuck"] }
 thiserror = { workspace = true }
 
 [dev-dependencies]
+solana-keypair = { workspace = true }
 tiny-bip39 = { workspace = true }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
diff --git a/zk-token-sdk/src/encryption/auth_encryption.rs b/zk-token-sdk/src/encryption/auth_encryption.rs
index a1395e472abe5b..910dca2f184d04 100644
--- a/zk-token-sdk/src/encryption/auth_encryption.rs
+++ b/zk-token-sdk/src/encryption/auth_encryption.rs
@@ -264,9 +264,8 @@ impl fmt::Display for AeCiphertext {
 #[cfg(test)]
 mod tests {
     use {
-        super::*,
-        solana_pubkey::Pubkey,
-        solana_signer::{keypair::Keypair, null_signer::NullSigner},
+        super::*, solana_keypair::Keypair, solana_pubkey::Pubkey,
+        solana_signer::null_signer::NullSigner,
     };
 
     #[test]
diff --git a/zk-token-sdk/src/encryption/elgamal.rs b/zk-token-sdk/src/encryption/elgamal.rs
index b642a337ca74d0..101dea6dcd2b02 100644
--- a/zk-token-sdk/src/encryption/elgamal.rs
+++ b/zk-token-sdk/src/encryption/elgamal.rs
@@ -867,8 +867,9 @@ mod tests {
         super::*,
         crate::encryption::pedersen::Pedersen,
         bip39::{Language, Mnemonic, MnemonicType, Seed},
+        solana_keypair::Keypair,
         solana_pubkey::Pubkey,
-        solana_signer::{keypair::Keypair, null_signer::NullSigner},
+        solana_signer::null_signer::NullSigner,
         std::fs::{self, File},
     };
 
diff --git a/zk-token-sdk/src/sigma_proofs/pubkey_proof.rs b/zk-token-sdk/src/sigma_proofs/pubkey_proof.rs
index 57b0f87bdcd69e..f6c0b78fc64954 100644
--- a/zk-token-sdk/src/sigma_proofs/pubkey_proof.rs
+++ b/zk-token-sdk/src/sigma_proofs/pubkey_proof.rs
@@ -138,7 +138,7 @@ impl PubkeyValidityProof {
 
 #[cfg(test)]
 mod test {
-    use {super::*, solana_pubkey::Pubkey, solana_signer::keypair::Keypair};
+    use {super::*, solana_keypair::Keypair, solana_pubkey::Pubkey};
 
     #[test]
     fn test_pubkey_proof_correctness() {