From c6cd0a5591b73ff073f1f19b8f2243534010899a Mon Sep 17 00:00:00 2001 From: Sam Kim Date: Thu, 16 Dec 2021 08:26:43 -0500 Subject: [PATCH] refactor: group equality and validity proofs in sigma_proofs module --- zk-token-sdk/src/instruction/transfer.rs | 3 +-- zk-token-sdk/src/instruction/withdraw.rs | 2 +- zk-token-sdk/src/lib.rs | 6 ++---- .../mod.rs => sigma_proofs/equality_proof.rs} | 0 .../mod.rs => sigma_proofs/validity_proof.rs} | 0 zk-token-sdk/src/zk_token_elgamal/convert.rs | 3 +-- 6 files changed, 5 insertions(+), 9 deletions(-) rename zk-token-sdk/src/{equality_proof/mod.rs => sigma_proofs/equality_proof.rs} (100%) rename zk-token-sdk/src/{validity_proof/mod.rs => sigma_proofs/validity_proof.rs} (100%) diff --git a/zk-token-sdk/src/instruction/transfer.rs b/zk-token-sdk/src/instruction/transfer.rs index 878d6f9e6..14bd46149 100644 --- a/zk-token-sdk/src/instruction/transfer.rs +++ b/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, diff --git a/zk-token-sdk/src/instruction/withdraw.rs b/zk-token-sdk/src/instruction/withdraw.rs index 4ddfa19ab..bc4b14e37 100644 --- a/zk-token-sdk/src/instruction/withdraw.rs +++ b/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, diff --git a/zk-token-sdk/src/lib.rs b/zk-token-sdk/src/lib.rs index ba4ec3971..bc0a0d49e 100644 --- a/zk-token-sdk/src/lib.rs +++ b/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; diff --git a/zk-token-sdk/src/equality_proof/mod.rs b/zk-token-sdk/src/sigma_proofs/equality_proof.rs similarity index 100% rename from zk-token-sdk/src/equality_proof/mod.rs rename to zk-token-sdk/src/sigma_proofs/equality_proof.rs diff --git a/zk-token-sdk/src/validity_proof/mod.rs b/zk-token-sdk/src/sigma_proofs/validity_proof.rs similarity index 100% rename from zk-token-sdk/src/validity_proof/mod.rs rename to zk-token-sdk/src/sigma_proofs/validity_proof.rs diff --git a/zk-token-sdk/src/zk_token_elgamal/convert.rs b/zk-token-sdk/src/zk_token_elgamal/convert.rs index ff085e14f..b216cab1d 100644 --- a/zk-token-sdk/src/zk_token_elgamal/convert.rs +++ b/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,