clippy check for tests (#346)

.github/workflows/clippy.yml

@@ -18,6 +18,4 @@ jobs:
         with:
           components: clippy
       - name: Check lints with clippy
-        run: cargo clippy
+        run: cargo clippy --tests --examples
-      - name: Check lints with clippy (examples)
-        run: cargo clippy --examples

src/backends/plonky2/mainpod/mod.rs

@@ -719,7 +719,7 @@ pub mod tests {
             self, literal, CustomPredicateBatchBuilder, MainPodBuilder, StatementTmplBuilder as STB,
         },
         middleware::{
-            self, containers::Set, CustomPredicateRef, NativePredicate as NP, Value, DEFAULT_VD_SET,
+            self, containers::Set, CustomPredicateRef, NativePredicate as NP, DEFAULT_VD_SET,
         },
         op,
     };
@@ -747,7 +747,7 @@ pub mod tests {
         let sanction_list_pod = sanction_list_builder.sign(&signer)?;
         let kyc_builder = zu_kyc_pod_builder(
             &params,
-            &vd_set,
+            vd_set,
             &gov_id_pod,
             &pay_stub_pod,
             &sanction_list_pod,
@@ -781,7 +781,7 @@ pub mod tests {
         let signer = Signer(SecretKey(42u64.into()));
         let gov_id = gov_id_builder.sign(&signer).unwrap();
         let now_minus_18y: i64 = 1169909388;
-        let mut kyc_builder = frontend::MainPodBuilder::new(&params, &vd_set);
+        let mut kyc_builder = frontend::MainPodBuilder::new(&params, vd_set);
         kyc_builder.add_signed_pod(&gov_id);
         kyc_builder
             .pub_op(op!(lt, (&gov_id, "dateOfBirth"), now_minus_18y))
@@ -829,7 +829,7 @@ pub mod tests {
         };
         let vd_set = &*DEFAULT_VD_SET;
 
-        let pod_builder = frontend::MainPodBuilder::new(&params, &vd_set);
+        let pod_builder = frontend::MainPodBuilder::new(&params, vd_set);
 
         // Mock
         let prover = MockProver {};
@@ -859,10 +859,10 @@ pub mod tests {
 
         // Alice attests that she is ETH friends with Bob and Bob
         // attests that he is ETH friends with Charlie.
-        let alice_attestation = attest_eth_friend(&params, &alice, Value::from(bob.public_key()));
+        let alice_attestation = attest_eth_friend(&params, &alice, bob.public_key());
-        let bob_attestation = attest_eth_friend(&params, &bob, Value::from(charlie.public_key()));
+        let bob_attestation = attest_eth_friend(&params, &bob, charlie.public_key());
 
-        let helper = EthDosHelper::new(&params, vd_set, false, Value::from(alice.public_key()))?;
+        let helper = EthDosHelper::new(&params, vd_set, false, alice.public_key())?;
         let prover = Prover {};
         let dist_1 = helper.dist_1(&alice_attestation)?.prove(&prover, &params)?;
         crate::measure_gates_print!();
@@ -908,7 +908,7 @@ pub mod tests {
         let cpb_and = CustomPredicateRef::new(cpb.clone(), 0);
         let _cpb_or = CustomPredicateRef::new(cpb.clone(), 1);
 
-        let mut pod_builder = MainPodBuilder::new(&params, &vd_set);
+        let mut pod_builder = MainPodBuilder::new(&params, vd_set);
 
         let st0 = pod_builder.priv_op(op!(new_entry, "score", 42))?;
         let st1 = pod_builder.priv_op(op!(new_entry, "key", 42))?;
@@ -932,7 +932,7 @@ pub mod tests {
     #[test]
     fn test_set_contains() -> frontend::Result<()> {
         let params = Params::default();
-        let mut builder = MainPodBuilder::new(&params, &*DEFAULT_VD_SET);
+        let mut builder = MainPodBuilder::new(&params, &DEFAULT_VD_SET);
         let set = [1, 2, 3].into_iter().map(|n| n.into()).collect();
         let st = builder
             .pub_op(op!(

src/backends/plonky2/mock/mainpod.rs

@@ -449,7 +449,7 @@ pub mod tests {
         let sanction_list_pod = sanction_list_builder.sign(&signer)?;
         let kyc_builder = zu_kyc_pod_builder(
             &params,
-            &vd_set,
+            vd_set,
             &gov_id_pod,
             &pay_stub_pod,
             &sanction_list_pod,

src/backends/plonky2/recursion/circuit.rs

@@ -832,7 +832,7 @@ mod tests {
         let common_data = &circuit_data_3.common;
 
         let (_, circuit_data_1) =
-            RC::<Circuit1>::target_and_circuit_data_padded(arity, &common_data, &inner_params)?;
+            RC::<Circuit1>::target_and_circuit_data_padded(arity, common_data, &inner_params)?;
         let params_1 = RecursiveParams {
             arity,
             common_data: circuit_data_1.common.clone(),
@@ -840,7 +840,7 @@ mod tests {
         };
 
         let (_, circuit_data_2) =
-            RC::<Circuit2>::target_and_circuit_data_padded(arity, &common_data, &inner_params)?;
+            RC::<Circuit2>::target_and_circuit_data_padded(arity, common_data, &inner_params)?;
         let params_2 = RecursiveParams {
             arity,
             common_data: circuit_data_2.common.clone(),

src/examples/mod.rs

@@ -4,7 +4,7 @@ use std::{collections::HashSet, sync::LazyLock};
 
 use custom::eth_dos_batch;
 
-pub const MOCK_VD_SET: LazyLock<VDSet> = LazyLock::new(|| VDSet::new(6, &[]).unwrap());
+pub static MOCK_VD_SET: LazyLock<VDSet> = LazyLock::new(|| VDSet::new(6, &[]).unwrap());
 
 use crate::{
     backends::plonky2::{primitives::ec::schnorr::SecretKey, signedpod::Signer},
@@ -266,11 +266,11 @@ pub fn great_boy_pod_builder(
     // good boy 1 -> friend_pods[1] => receiver
 
     let mut great_boy = MainPodBuilder::new(params, vd_set);
-    for i in 0..4 {
+    for good_boy_pod in good_boy_pods {
-        great_boy.add_signed_pod(good_boy_pods[i]);
+        great_boy.add_signed_pod(good_boy_pod);
     }
-    for i in 0..2 {
+    for friend_pod in friend_pods {
-        great_boy.add_signed_pod(friend_pods[i]);
+        great_boy.add_signed_pod(friend_pod);
     }
 
     for good_boy_idx in 0..2 {
@@ -376,7 +376,7 @@ pub fn great_boy_pod_full_flow() -> Result<(Params, MainPodBuilder)> {
 
     let builder = great_boy_pod_builder(
         &params,
-        &vd_set,
+        vd_set,
         [
             &bob_good_boys[0],
             &bob_good_boys[1],

src/frontend/custom.rs

@@ -288,7 +288,7 @@ mod tests {
         let batch_clone = batch.clone();
         let gt_custom_pred = CustomPredicateRef::new(batch, 0);
 
-        let mut mp_builder = MainPodBuilder::new(&params, &vd_set);
+        let mut mp_builder = MainPodBuilder::new(&params, vd_set);
 
         // 2 > 1
         let s1 = mp_builder.priv_op(op!(new_entry, "s1_key", Value::from(2)))?;
@@ -337,7 +337,7 @@ mod tests {
         let batch = builder.finish();
         let batch_clone = batch.clone();
 
-        let mut mp_builder = MainPodBuilder::new(&params, &vd_set);
+        let mut mp_builder = MainPodBuilder::new(&params, vd_set);
 
         let set_values: HashSet<Value> = [1, 2, 3].iter().map(|i| Value::from(*i)).collect();
         let s1 = mp_builder.priv_op(op!(

src/frontend/mod.rs

@@ -892,7 +892,7 @@ pub mod tests {
         check_kvs(&sanction_list)?;
         println!("{}", sanction_list);
 
-        let kyc_builder = zu_kyc_pod_builder(&params, &vd_set, &gov_id, &pay_stub, &sanction_list)?;
+        let kyc_builder = zu_kyc_pod_builder(&params, vd_set, &gov_id, &pay_stub, &sanction_list)?;
         println!("{}", kyc_builder);
 
         // prove kyc with MockProver and print it
@@ -973,7 +973,7 @@ pub mod tests {
         let signer = Signer(SecretKey(1u32.into()));
         let signed_pod = signed_builder.sign(&signer).unwrap();
 
-        let mut builder = MainPodBuilder::new(&params, &vd_set);
+        let mut builder = MainPodBuilder::new(&params, vd_set);
         builder.add_signed_pod(&signed_pod);
 
         //let op_val1 = Operation{
@@ -1026,7 +1026,7 @@ pub mod tests {
 
         println!("{}", pod);
 
-        let mut builder = MainPodBuilder::new(&params, &vd_set);
+        let mut builder = MainPodBuilder::new(&params, vd_set);
         builder.add_signed_pod(&pod);
         builder.pub_op(op!(gt, (&pod, "num"), 5)).unwrap();
 
@@ -1056,7 +1056,7 @@ pub mod tests {
         let signer = Signer(SecretKey(1u32.into()));
         let pod = builder.sign(&signer).unwrap();
 
-        let mut builder = MainPodBuilder::new(&params, &vd_set);
+        let mut builder = MainPodBuilder::new(&params, vd_set);
         builder.add_signed_pod(&pod);
         let st0 = pod.get_statement("dict").unwrap();
         let st1 = builder.op(true, op!(new_entry, "key", "a")).unwrap();
@@ -1093,7 +1093,7 @@ pub mod tests {
 
         let params = Params::default();
         let vd_set = &*MOCK_VD_SET;
-        let mut builder = MainPodBuilder::new(&params, &vd_set);
+        let mut builder = MainPodBuilder::new(&params, vd_set);
         let st = Statement::equal(AnchoredKey::from((SELF, "a")), Value::from(3));
         let op_new_entry = Operation(
             OperationType::Native(NativeOperation::NewEntry),
@@ -1117,7 +1117,7 @@ pub mod tests {
         // right now the mock prover catches this when it calls compile()
         let params = Params::default();
         let vd_set = &*MOCK_VD_SET;
-        let mut builder = MainPodBuilder::new(&params, &vd_set);
+        let mut builder = MainPodBuilder::new(&params, vd_set);
         let self_a = AnchoredKey::from((SELF, "a"));
         let self_b = AnchoredKey::from((SELF, "b"));
         let value_of_a = Statement::equal(self_a.clone(), Value::from(3));

src/frontend/serialization.rs

@@ -269,7 +269,7 @@ mod tests {
         let sanction_list_pod = sanction_list_builder.sign(&signer).unwrap();
         let kyc_builder = zu_kyc_pod_builder(
             &params,
-            &vd_set,
+            vd_set,
             &gov_id_pod,
             &pay_stub_pod,
             &sanction_list_pod,
@@ -300,7 +300,7 @@ mod tests {
         let sanction_list_pod = sanction_list_builder.sign(&signer)?;
         let kyc_builder = zu_kyc_pod_builder(
             &params,
-            &vd_set,
+            vd_set,
             &gov_id_pod,
             &pay_stub_pod,
             &sanction_list_pod,

src/middleware/custom.rs

@@ -466,6 +466,7 @@ mod tests {
         names.iter().map(|s| s.to_string()).collect()
     }
 
+    #[allow(clippy::upper_case_acronyms)]
     type STA = StatementTmplArg;
     type P = Predicate;
     type NP = NativePredicate;