Less clones

brave-experiments · Aug 20, 2024 · 54a0c58 · 54a0c58
1 parent ba97df1
commit 54a0c58
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 33 deletions.
diff --git a/boomerang/src/client.rs b/boomerang/src/client.rs
@@ -113,7 +113,7 @@ impl<B: BoomerangConfig> IssuanceC<B> {
     /// * `key_pair` - the client's keypair.
     /// * `rng` - the source of randomness.
     pub fn generate_issuance_m1<T: RngCore + CryptoRng>(
-        key_pair: UKeyPair<B>,
+        key_pair: &UKeyPair<B>,
         rng: &mut T,
     ) -> IssuanceC<B> {
         let id_0 = <B as CurveConfig>::ScalarField::rand(rng);

diff --git a/macros/src/bench_tboomerang.rs b/macros/src/bench_tboomerang.rs
@@ -8,7 +8,7 @@ macro_rules! bench_tboomerang_issuance_m1_time {
             // Now we can just benchmark how long it takes for the first message.
             c.bench_function(concat!($curve_name, " issuance m1 time"), |b| {
                 b.iter(|| {
-                    IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+                    IBCM::generate_issuance_m1(&kp, &mut OsRng);
                 });
             });
         }
@@ -22,7 +22,7 @@ macro_rules! bench_tboomerang_issuance_m2_time {
             // Bench the first message of the boomerang scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
 
             // Now we can just benchmark how long it takes for the first message.
             c.bench_function(concat!($curve_name, " issuance m2 time"), |b| {
@@ -41,7 +41,7 @@ macro_rules! bench_tboomerang_issuance_m3_time {
             // Bench the first message of the boomerang scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
 
             // Now we can just benchmark how long it takes for the first message.
@@ -61,7 +61,7 @@ macro_rules! bench_tboomerang_issuance_m4_time {
             // Bench the first message of the boomerang scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
 
@@ -82,7 +82,7 @@ macro_rules! bench_tboomerang_issuance_m5_time {
             // Bench the first message of the boomerang issuance scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -104,7 +104,7 @@ macro_rules! bench_tboomerang_collection_m1_time {
             // Bench the first message of the boomerang collection scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -127,7 +127,7 @@ macro_rules! bench_tboomerang_collection_m2_time {
             // Bench the second message of the boomerang collection scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -151,7 +151,7 @@ macro_rules! bench_tboomerang_collection_m3_time {
             // Bench the third message of the boomerang collection scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -178,7 +178,7 @@ macro_rules! bench_tboomerang_collection_m4_time {
             // Bench the fourth message of the boomerang collection scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -208,7 +208,7 @@ macro_rules! bench_tboomerang_collection_m5_time {
             // Bench the fifth message of the boomerang collection scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -240,7 +240,7 @@ macro_rules! bench_tboomerang_collection_m6_time {
             // Bench the sixth message of the boomerang collection scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -272,7 +272,7 @@ macro_rules! bench_tboomerang_spending_m1_time {
             // Bench the first message of the boomerang spending scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -305,7 +305,7 @@ macro_rules! bench_tboomerang_spending_m2_time {
             // Bench the second message of the boomerang spending scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -348,7 +348,7 @@ macro_rules! bench_tboomerang_spending_m3_time {
             // Bench the third message of the boomerang spending scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -406,7 +406,7 @@ macro_rules! bench_tboomerang_spending_m4_time {
             // Bench the forth message of the boomerang spending scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -465,7 +465,7 @@ macro_rules! bench_tboomerang_spending_m5_time {
             // Bench the fifth message of the boomerang spending scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);
@@ -526,7 +526,7 @@ macro_rules! bench_tboomerang_spending_m6_time {
             // Bench the sixth message of the boomerang spending scheme.
             let kp = CBKP::<$config>::generate(&mut OsRng);
             let skp = SBKP::generate(&mut OsRng);
-            let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut OsRng);
+            let m1 = IBCM::generate_issuance_m1(&kp, &mut OsRng);
             let m2 = IBSM::generate_issuance_m2(m1.clone(), &skp, &mut OsRng);
             let m3 = IBCM::generate_issuance_m3(m1.clone(), m2.clone(), &mut OsRng);
             let m4 = IBSM::generate_issuance_m4(m3.clone(), m2.clone(), &skp);

diff --git a/macros/src/test_boomerang.rs b/macros/src/test_boomerang.rs
@@ -32,10 +32,10 @@ macro_rules! __test_boomerang {
         #[test]
         fn test_boomerang_m1() {
             // Test the first message of the boomerang scheme.
-            let kp = CBKP::generate(&mut OsRng);
-            assert!(kp.public_key.is_on_curve());
+            let ckp = CBKP::generate(&mut OsRng);
+            assert!(ckp.public_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(kp, &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
         }
 
@@ -49,7 +49,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp, &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1, &skp, &mut OsRng);
@@ -67,7 +67,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp, &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -88,7 +88,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp, &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -112,7 +112,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -152,7 +152,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -198,7 +198,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -259,7 +259,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -348,7 +348,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -490,7 +490,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -592,7 +592,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);
@@ -710,7 +710,7 @@ macro_rules! __test_boomerang {
             assert!(skp.s_key_pair.verifying_key.is_on_curve());
             assert!(skp.s_key_pair.tag_key.is_on_curve());
 
-            let issuance_m1 = IBCM::generate_issuance_m1(ckp.clone(), &mut OsRng);
+            let issuance_m1 = IBCM::generate_issuance_m1(&ckp, &mut OsRng);
             assert!(issuance_m1.m1.u_pk.is_on_curve());
 
             let issuance_m2 = IBSM::generate_issuance_m2(issuance_m1.clone(), &skp, &mut OsRng);

diff --git a/t256/src/e2e/client.rs b/t256/src/e2e/client.rs
@@ -46,7 +46,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let mut rng = OsRng;
     let kp = CBKP::generate(&mut rng);
-    let m1 = IBCM::generate_issuance_m1(kp.clone(), &mut rng);
+    let m1 = IBCM::generate_issuance_m1(&kp, &mut rng);
     let mut m1_bytes = Vec::new();
     m1.serialize_compressed(&mut m1_bytes).unwrap();