Remove redundant type

Signed-off-by: lovesh <[email protected]>

Author: lovesh

delg_cred_cdd/src/attribute_token.rs

@@ -2287,14 +2287,14 @@ mod tests {
             println!("Commitment takes {:?}, response takes {:?}, commitment reconstitution takes {:?}. Total time taken by commitment and response is {:?}",
                      com_duration, resp_duration, recon_duration, com_duration + resp_duration);
             println!(
-                "Commitment with precomputation on setup paprams takes {:?}",
+                "Commitment with precomputation on setup params takes {:?}",
                 com_precomp_setup_duration
             );
             println!(
-                "Commitment with precomputation on setup paprams and signature takes {:?}",
+                "Commitment with precomputation on setup params and signature takes {:?}",
                 com_precomp_duration
             );
-            println!("Commitment reconstitution with precomputation on setup paprams and root issuer key takes {:?}", recon_precomp_duration);
+            println!("Commitment reconstitution with precomputation on setup params and root issuer key takes {:?}", recon_precomp_duration);
         }
     }
 

delg_cred_cdd/src/groth_sig.rs

@@ -5,18 +5,18 @@ use amcl_wrapper::group_elem::{GroupElement, GroupElementVector};
 use amcl_wrapper::group_elem_g1::{G1LookupTable, G1Vector, G1};
 use amcl_wrapper::group_elem_g2::{G2Vector, G2};
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GrothSigkey(pub FieldElement);
+
 macro_rules! impl_GrothS {
-    ( $GrothSetupParams:ident, $GrothSigkey:ident, $GrothVerkey:ident, $GrothSig:ident, $GrothS:ident, $vk_group:ident, $msg_group:ident, $GVector:ident ) => {
+    ( $GrothSetupParams:ident, $GrothVerkey:ident, $GrothSig:ident, $GrothS:ident, $vk_group:ident, $msg_group:ident, $GVector:ident ) => {
         #[derive(Clone, Debug, Serialize, Deserialize)]
         pub struct $GrothSetupParams {
             pub g1: G1,
             pub g2: G2,
             pub y: $GVector,
         }
 
-        #[derive(Clone, Debug, Serialize, Deserialize)]
-        pub struct $GrothSigkey(pub FieldElement);
-
         #[derive(Clone, Debug, Serialize, Deserialize)]
         pub struct $GrothVerkey(pub $vk_group);
 
@@ -88,7 +88,6 @@ macro_rules! impl_GrothSig_randomize {
 
 impl_GrothS!(
     Groth1SetupParams,
-    Groth1Sigkey,
     Groth1Verkey,
     Groth1Sig,
     GrothS1,
@@ -99,7 +98,6 @@ impl_GrothS!(
 
 impl_GrothS!(
     Groth2SetupParams,
-    Groth2Sigkey,
     Groth2Verkey,
     Groth2Sig,
     GrothS2,
@@ -124,17 +122,17 @@ macro_rules! var_time_mul_scl_mul_with_same_field_element {
 impl GrothS1 {
     impl_GrothS_setup!(Groth1SetupParams, G1, G1Vector);
 
-    pub fn keygen(setup_params: &Groth1SetupParams) -> (Groth1Sigkey, Groth1Verkey) {
+    pub fn keygen(setup_params: &Groth1SetupParams) -> (GrothSigkey, Groth1Verkey) {
         let sk = FieldElement::random();
         let vk = &setup_params.g2 * &sk;
-        (Groth1Sigkey(sk), Groth1Verkey(vk))
+        (GrothSigkey(sk), Groth1Verkey(vk))
     }
 }
 
 impl Groth1Sig {
     pub fn new(
         messages: &[G1],
-        sk: &Groth1Sigkey,
+        sk: &GrothSigkey,
         setup_params: &Groth1SetupParams,
     ) -> DelgResult<Self> {
         impl_GrothSig_new!(
@@ -252,17 +250,17 @@ impl Groth1Sig {
 impl GrothS2 {
     impl_GrothS_setup!(Groth2SetupParams, G2, G2Vector);
 
-    pub fn keygen(setup_params: &Groth2SetupParams) -> (Groth2Sigkey, Groth2Verkey) {
+    pub fn keygen(setup_params: &Groth2SetupParams) -> (GrothSigkey, Groth2Verkey) {
         let sk = FieldElement::random();
         let vk = &setup_params.g1 * &sk;
-        (Groth2Sigkey(sk), Groth2Verkey(vk))
+        (GrothSigkey(sk), Groth2Verkey(vk))
     }
 }
 
 impl Groth2Sig {
     pub fn new(
         messages: &[G2],
-        sk: &Groth2Sigkey,
+        sk: &GrothSigkey,
         setup_params: &Groth2SetupParams,
     ) -> DelgResult<Self> {
         impl_GrothSig_new!(

delg_cred_cdd/src/issuer.rs

@@ -1,15 +1,14 @@
 use crate::errors::{DelgError, DelgResult};
 use crate::groth_sig::{
-    Groth1SetupParams, Groth1Sig, Groth1Sigkey, Groth1Verkey, Groth2SetupParams, Groth2Sig,
-    Groth2Sigkey, Groth2Verkey, GrothS1, GrothS2,
+    Groth1SetupParams, Groth1Sig, Groth1Verkey, Groth2SetupParams, Groth2Sig, Groth2Verkey,
+    GrothS1, GrothS2, GrothSigkey,
 };
 use amcl_wrapper::group_elem::{GroupElement, GroupElementVector};
 use amcl_wrapper::group_elem_g1::{G1LookupTable, G1Vector, G1};
 use amcl_wrapper::group_elem_g2::{G2Vector, G2};
 
-pub type EvenLevelSigkey = Groth1Sigkey;
+pub type Sigkey = GrothSigkey;
 pub type EvenLevelVerkey = Groth1Verkey;
-pub type OddLevelSigkey = Groth2Sigkey;
 pub type OddLevelVerkey = Groth2Verkey;
 
 // (attributes, signature). The signature is over the attributes and the public key combined by appending public key to the attribute vector.
@@ -314,15 +313,15 @@ impl EvenLevelIssuer {
         Ok(Self { level })
     }
 
-    pub fn keygen(setup_params: &Groth1SetupParams) -> (EvenLevelSigkey, EvenLevelVerkey) {
+    pub fn keygen(setup_params: &Groth1SetupParams) -> (Sigkey, EvenLevelVerkey) {
         GrothS1::keygen(setup_params)
     }
 
     pub fn delegate(
         &self,
         mut delegatee_attributes: G1Vector,
         delegatee_vk: OddLevelVerkey,
-        sk: &EvenLevelSigkey,
+        sk: &Sigkey,
         setup_params: &Groth1SetupParams,
     ) -> DelgResult<CredLinkOdd> {
         if delegatee_attributes.len() >= setup_params.y.len() {
@@ -349,15 +348,15 @@ impl OddLevelIssuer {
         Ok(Self { level })
     }
 
-    pub fn keygen(setup_params: &Groth2SetupParams) -> (OddLevelSigkey, OddLevelVerkey) {
+    pub fn keygen(setup_params: &Groth2SetupParams) -> (Sigkey, OddLevelVerkey) {
         GrothS2::keygen(setup_params)
     }
 
     pub fn delegate(
         &self,
         mut delegatee_attributes: G2Vector,
         delegatee_vk: EvenLevelVerkey,
-        sk: &OddLevelSigkey,
+        sk: &Sigkey,
         setup_params: &Groth2SetupParams,
     ) -> DelgResult<CredLinkEven> {
         if delegatee_attributes.len() >= setup_params.y.len() {