refactor: group equality and validity proofs in sigma_proofs module

zk-token-sdk/src/instruction/transfer.rs

@@ -10,12 +10,11 @@ use {
             elgamal::{ElGamalCiphertext, ElGamalKeypair, ElGamalPubkey, ElGamalSecretKey},
             pedersen::{Pedersen, PedersenCommitment, PedersenDecryptHandle, PedersenOpening},
         },
-        equality_proof::EqualityProof,
+        sigma_proofs::{equality_proof::EqualityProof, validity_proof::ValidityProof},
         errors::ProofError,
         instruction::{Role, Verifiable},
         range_proof::RangeProof,
         transcript::TranscriptProtocol,
-        validity_proof::ValidityProof,
     },
     curve25519_dalek::scalar::Scalar,
     merlin::Transcript,

zk-token-sdk/src/instruction/withdraw.rs

@@ -9,7 +9,7 @@ use {
             elgamal::{ElGamalCiphertext, ElGamalKeypair, ElGamalPubkey},
             pedersen::{Pedersen, PedersenCommitment, PedersenOpening},
         },
-        equality_proof::EqualityProof,
+        sigma_proofs::equality_proof::EqualityProof,
         errors::ProofError,
         instruction::Verifiable,
         range_proof::RangeProof,

zk-token-sdk/src/lib.rs

@@ -4,15 +4,13 @@ pub(crate) mod macros;
 #[cfg(not(target_arch = "bpf"))]
 pub mod encryption;
 #[cfg(not(target_arch = "bpf"))]
-mod equality_proof;
-#[cfg(not(target_arch = "bpf"))]
 mod errors;
 #[cfg(not(target_arch = "bpf"))]
 mod range_proof;
 #[cfg(not(target_arch = "bpf"))]
-mod transcript;
+mod sigma_proofs;
 #[cfg(not(target_arch = "bpf"))]
-mod validity_proof;
+mod transcript;
 
 mod instruction;
 pub mod zk_token_elgamal;

zk-token-sdk/src/zk_token_elgamal/convert.rs

@@ -20,10 +20,9 @@ mod target_arch {
                 elgamal::{ElGamalCiphertext, ElGamalPubkey},
                 pedersen::{PedersenCommitment, PedersenDecryptHandle},
             },
-            equality_proof::EqualityProof,
+            sigma_proofs::{equality_proof::EqualityProof, validity_proof::ValidityProof},
             errors::ProofError,
             range_proof::RangeProof,
-            validity_proof::ValidityProof,
         },
         curve25519_dalek::{ristretto::CompressedRistretto, scalar::Scalar},
         std::convert::TryFrom,