Merge pull request #80 from brave-experiments/rewards-proof-warnings

Fix warnings in rewards-proof examples
brave-experiments · Jul 29, 2024 · ea4601d · ea4601d
2 parents 88c7f94 + 80a9e83
commit ea4601d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/rewards-proof/benches/proofs_benchmark.rs b/rewards-proof/benches/proofs_benchmark.rs
@@ -31,22 +31,21 @@ fn benchmark_rewardsproof_generation<C: SWCurveConfig>(c: &mut Criterion) {
         let policy_vector_scalar: Vec<C::ScalarField> = policy_vector
             .clone()
             .into_iter()
-            .map(|u64_value| C::ScalarField::from(u64_value))
+            .map(C::ScalarField::from)
             .collect();
         // private value
         let state: Vec<u64> = (0..*size).map(|_| rng.gen_range(0..10)).collect();
         let state_scalar: Vec<C::ScalarField> = state
             .clone()
             .into_iter()
-            .map(|u64_value| C::ScalarField::from(u64_value))
+            .map(C::ScalarField::from)
             .collect();
 
         // reward = <state, policy_vector>
         let reward: u64 = state
             .iter()
             .zip(policy_vector.iter())
-            .map(|(x, y)| x.checked_mul(*y))
-            .flatten()
+            .filter_map(|(x, y)| x.checked_mul(*y))
             .sum();
 
         // create generators
@@ -83,22 +82,21 @@ fn benchmark_rewardsproof_verification<C: SWCurveConfig>(c: &mut Criterion) {
         let policy_vector_scalar: Vec<C::ScalarField> = policy_vector
             .clone()
             .into_iter()
-            .map(|u64_value| C::ScalarField::from(u64_value))
+            .map(C::ScalarField::from)
             .collect();
         // private value
         let state: Vec<u64> = (0..*size).map(|_| rng.gen_range(0..10)).collect();
         let state_scalar: Vec<C::ScalarField> = state
             .clone()
             .into_iter()
-            .map(|u64_value| C::ScalarField::from(u64_value))
+            .map(C::ScalarField::from)
             .collect();
 
         // reward = <state, policy_vector>
         let reward: u64 = state
             .iter()
             .zip(policy_vector.iter())
-            .map(|(x, y)| x.checked_mul(*y))
-            .flatten()
+            .filter_map(|(x, y)| x.checked_mul(*y))
             .sum();
 
         // create variables for linear proof
@@ -156,22 +154,21 @@ fn benchmark_rewardsproof_verification_multiple_users<C: SWCurveConfig>(
     let policy_vector_scalar: Vec<C::ScalarField> = policy_vector
         .clone()
         .into_iter()
-        .map(|u64_value| C::ScalarField::from(u64_value))
+        .map(C::ScalarField::from)
         .collect();
     // private value
     let state: Vec<u64> = (0..incentive_size).map(|_| rng.gen_range(0..10)).collect();
     let state_scalar: Vec<C::ScalarField> = state
         .clone()
         .into_iter()
-        .map(|u64_value| C::ScalarField::from(u64_value))
+        .map(C::ScalarField::from)
         .collect();
 
     // reward = <state, policy_vector>
     let reward: u64 = state
         .iter()
         .zip(policy_vector.iter())
-        .map(|(x, y)| x.checked_mul(*y))
-        .flatten()
+        .filter_map(|(x, y)| x.checked_mul(*y))
         .sum();
 
     // generate number_of_users proofs

diff --git a/rewards-proof/examples/example_proofs.rs b/rewards-proof/examples/example_proofs.rs
@@ -30,8 +30,7 @@ fn rewards_proof_example<C: SWCurveConfig>() {
     let reward: u64 = state
         .iter()
         .zip(policy_vector.iter())
-        .map(|(x, y)| x.checked_mul(*y))
-        .flatten()
+        .filter_map(|(x, y)| x.checked_mul(*y))
         .sum();
 
     println!("Policy vector: {:?}", policy_vector);
@@ -42,13 +41,13 @@ fn rewards_proof_example<C: SWCurveConfig>() {
     let state_scalar: Vec<C::ScalarField> = state
         .clone()
         .into_iter()
-        .map(|u64_value| C::ScalarField::from(u64_value))
+        .map(C::ScalarField::from)
         .collect();
 
     let policy_vector_scalar: Vec<C::ScalarField> = policy_vector
         .clone()
         .into_iter()
-        .map(|u64_value| C::ScalarField::from(u64_value))
+        .map(C::ScalarField::from)
         .collect();
 
     // generate rewards proof
@@ -71,7 +70,7 @@ fn rewards_proof_example<C: SWCurveConfig>() {
         policy_vector_scalar,
         linear_comm,
     ) {
-        println!("Rewards proof verification successfull!");
+        println!("Rewards proof verification successful!");
     } else {
         println!("Rewards proof verification failed!");
     }