Remove lifetime from DLCard

geometryxyz · Jan 28, 2025 · 4d34503 · 4d34503
1 parent b341ea6
commit 4d34503
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/barnett-smart-card-protocol/examples/parameter_selection.rs b/barnett-smart-card-protocol/examples/parameter_selection.rs
@@ -26,7 +26,7 @@ type Curve = ark_bls12_377::G1Projective;
 type Scalar = ark_bls12_377::Fr;
 
 // Instantiate concrete type for our card protocol
-type CardProtocol<'a> = discrete_log_cards::DLCards<'a, Curve>;
+type CardProtocol = discrete_log_cards::DLCards<Curve>;
 
 const NUMBER_OF_CARDS: usize = 300;
 

diff --git a/barnett-smart-card-protocol/examples/round.rs b/barnett-smart-card-protocol/examples/round.rs
@@ -17,7 +17,7 @@ type Curve = starknet_curve::Projective;
 type Scalar = starknet_curve::Fr;
 
 // Instantiate concrete type for our card protocol
-type CardProtocol<'a> = discrete_log_cards::DLCards<'a, Curve>;
+type CardProtocol = discrete_log_cards::DLCards<Curve>;
 type CardParameters = discrete_log_cards::Parameters<Curve>;
 type PublicKey = discrete_log_cards::PublicKey<Curve>;
 type SecretKey = discrete_log_cards::PlayerSecretKey<Curve>;

diff --git a/barnett-smart-card-protocol/src/discrete_log_cards/masking.rs b/barnett-smart-card-protocol/src/discrete_log_cards/masking.rs
@@ -35,7 +35,7 @@ mod test {
     type Scalar = starknet_curve::Fr;
 
     // Instantiate concrete type for our card protocol
-    type CardProtocol<'a> = discrete_log_cards::DLCards<'a, Curve>;
+    type CardProtocol = discrete_log_cards::DLCards<Curve>;
     type CardParameters = discrete_log_cards::Parameters<Curve>;
     type PublicKey = discrete_log_cards::PublicKey<Curve>;
     type SecretKey = discrete_log_cards::PlayerSecretKey<Curve>;

diff --git a/barnett-smart-card-protocol/src/discrete_log_cards/mod.rs b/barnett-smart-card-protocol/src/discrete_log_cards/mod.rs
@@ -30,8 +30,8 @@ mod remasking;
 mod reveal;
 mod tests;
 
-pub struct DLCards<'a, C: ProjectiveCurve> {
-    _group: &'a PhantomData<C>,
+pub struct DLCards<C: ProjectiveCurve> {
+    _group: PhantomData<&'static C>,
 }
 
 pub struct Parameters<C: ProjectiveCurve> {
@@ -83,7 +83,7 @@ const REMASKING_RNG_SEED: &'static [u8] = b"Remasking Proof";
 const REVEAL_RNG_SEED: &'static [u8] = b"Reveal Proof";
 const SHUFFLE_RNG_SEED: &'static [u8] = b"Shuffle Proof";
 
-impl<'a, C: ProjectiveCurve> BarnettSmartProtocol for DLCards<'a, C> {
+impl<C: ProjectiveCurve> BarnettSmartProtocol for DLCards<C> {
     type Scalar = C::ScalarField;
     type Enc = ElGamal<C>;
     type Comm = PedersenCommitment<C>;

diff --git a/barnett-smart-card-protocol/src/discrete_log_cards/remasking.rs b/barnett-smart-card-protocol/src/discrete_log_cards/remasking.rs
@@ -37,7 +37,7 @@ mod test {
     type Scalar = starknet_curve::Fr;
 
     // Instantiate concrete type for our card protocol
-    type CardProtocol<'a> = discrete_log_cards::DLCards<'a, Curve>;
+    type CardProtocol = discrete_log_cards::DLCards<Curve>;
     type CardParameters = discrete_log_cards::Parameters<Curve>;
     type PublicKey = discrete_log_cards::PublicKey<Curve>;
     type SecretKey = discrete_log_cards::PlayerSecretKey<Curve>;

diff --git a/barnett-smart-card-protocol/src/discrete_log_cards/reveal.rs b/barnett-smart-card-protocol/src/discrete_log_cards/reveal.rs
@@ -33,7 +33,7 @@ mod test {
     type Curve = starknet_curve::Projective;
 
     // Instantiate concrete type for our card protocol
-    type CardProtocol<'a> = discrete_log_cards::DLCards<'a, Curve>;
+    type CardProtocol = discrete_log_cards::DLCards<Curve>;
 
     type MaskedCard = discrete_log_cards::MaskedCard<Curve>;
     type RevealToken = discrete_log_cards::RevealToken<Curve>;

diff --git a/barnett-smart-card-protocol/src/discrete_log_cards/tests.rs b/barnett-smart-card-protocol/src/discrete_log_cards/tests.rs
@@ -17,7 +17,7 @@ mod test {
     type Scalar = starknet_curve::Fr;
 
     // Instantiate concrete type for our card protocol
-    type CardProtocol<'a> = discrete_log_cards::DLCards<'a, Curve>;
+    type CardProtocol = discrete_log_cards::DLCards<Curve>;
     type CardParameters = discrete_log_cards::Parameters<Curve>;
     type PublicKey = discrete_log_cards::PublicKey<Curve>;
     type SecretKey = discrete_log_cards::PlayerSecretKey<Curve>;