post-rebase fix

anza-xyz · Nov 5, 2024 · 9551211 · 9551211
1 parent 1c75569
commit 9551211
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zk-sdk/Cargo.toml b/zk-sdk/Cargo.toml
@@ -21,6 +21,7 @@ solana-pubkey = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
+solana-keypair = { workspace = true }
 tiny-bip39 = { workspace = true }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]

diff --git a/zk-sdk/src/encryption/auth_encryption.rs b/zk-sdk/src/encryption/auth_encryption.rs
@@ -278,9 +278,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-sdk/src/encryption/elgamal.rs b/zk-sdk/src/encryption/elgamal.rs
@@ -835,8 +835,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-sdk/src/sigma_proofs/pubkey_validity.rs b/zk-sdk/src/sigma_proofs/pubkey_validity.rs
@@ -143,8 +143,8 @@ mod test {
         crate::{
             encryption::pod::elgamal::PodElGamalPubkey, sigma_proofs::pod::PodPubkeyValidityProof,
         },
+        solana_keypair::Keypair,
         solana_pubkey::Pubkey,
-        solana_signer::keypair::Keypair,
         std::str::FromStr,
     };