ソースを参照

chore: clippy

aggstam 3 年 前
コミット
53cdc50e15

+ 2 - 2
src/contract/consensus/src/client/common.rs

@@ -91,7 +91,7 @@ pub fn create_consensus_mint_proof(
         Witness::Scalar(Value::known(output.value_blind)),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))
@@ -172,7 +172,7 @@ pub fn create_consensus_burn_proof(
         Witness::MerklePath(Value::known(input.merkle_path.clone().try_into().unwrap())),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs, input.secret))

+ 1 - 1
src/contract/consensus/src/client/proposal_v1.rs

@@ -352,7 +352,7 @@ fn create_proposal_proof(
         Witness::Base(Value::known(public_inputs.headstart)),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))

+ 1 - 1
src/contract/dao/src/client/exec.rs

@@ -171,7 +171,7 @@ impl DaoExecCall {
             user_data,
         ];
 
-        let circuit = ZkCircuit::new(prover_witnesses, &exec_zkbin);
+        let circuit = ZkCircuit::new(prover_witnesses, exec_zkbin);
         let input_proof = Proof::create(exec_pk, &[circuit], &public_inputs, &mut OsRng)
             .expect("DAO::exec() proving error!)");
         proofs.push(input_proof);

+ 1 - 1
src/contract/dao/src/client/mint.rs

@@ -80,7 +80,7 @@ pub fn make_mint_call(
 
     let public = vec![pub_x, pub_y, dao_bulla];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &dao_mint_zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, dao_mint_zkbin);
     let proof = Proof::create(dao_mint_pk, &[circuit], &public, &mut OsRng)?;
 
     let dao_mint_params = DaoMintParams { dao_bulla: dao_bulla.into(), dao_pubkey: dao.public_key };

+ 2 - 2
src/contract/dao/src/client/propose.rs

@@ -154,7 +154,7 @@ impl DaoProposeCall {
                 sig_x,
                 sig_y,
             ];
-            let circuit = ZkCircuit::new(prover_witnesses, &burn_zkbin);
+            let circuit = ZkCircuit::new(prover_witnesses, burn_zkbin);
 
             let proving_key = &burn_pk;
             let input_proof = Proof::create(proving_key, &[circuit], &public_inputs, &mut OsRng)
@@ -235,7 +235,7 @@ impl DaoProposeCall {
             *total_funds_coords.x(),
             *total_funds_coords.y(),
         ];
-        let circuit = ZkCircuit::new(prover_witnesses, &main_zkbin);
+        let circuit = ZkCircuit::new(prover_witnesses, main_zkbin);
 
         let main_proof = Proof::create(main_pk, &[circuit], &public_inputs, &mut OsRng)
             .expect("DAO::propose() proving error!");

+ 2 - 2
src/contract/dao/src/client/vote.rs

@@ -157,7 +157,7 @@ impl DaoVoteCall {
                 sig_y,
             ];
 
-            let circuit = ZkCircuit::new(prover_witnesses, &burn_zkbin);
+            let circuit = ZkCircuit::new(prover_witnesses, burn_zkbin);
             debug!(target: "dao", "input_proof Proof::create()");
             let input_proof = Proof::create(burn_pk, &[circuit], &public_inputs, &mut OsRng)
                 .expect("DAO::vote() proving error!");
@@ -251,7 +251,7 @@ impl DaoVoteCall {
             *all_vote_commit_coords.y(),
         ];
 
-        let circuit = ZkCircuit::new(prover_witnesses, &main_zkbin);
+        let circuit = ZkCircuit::new(prover_witnesses, main_zkbin);
 
         debug!(target: "dao", "main_proof = Proof::create()");
         let main_proof = Proof::create(main_pk, &[circuit], &public_inputs, &mut OsRng)

+ 1 - 1
src/contract/money/src/client/stake_v1.rs

@@ -221,7 +221,7 @@ pub fn create_stake_burn_proof(
         Witness::Base(Value::known(signature_secret.inner())),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))

+ 1 - 1
src/contract/money/src/client/token_freeze_v1.rs

@@ -87,7 +87,7 @@ pub(crate) fn create_token_freeze_proof(
 
     let prover_witnesses = vec![Witness::Base(Value::known(mint_authority.secret.inner()))];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))

+ 1 - 1
src/contract/money/src/client/token_mint_v1.rs

@@ -217,7 +217,7 @@ pub fn create_token_mint_proof(
         Witness::Scalar(Value::known(token_blind)),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))

+ 2 - 2
src/contract/money/src/client/transfer_v1.rs

@@ -456,7 +456,7 @@ pub fn create_transfer_burn_proof(
         Witness::Base(Value::known(signature_secret.inner())),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))
@@ -501,7 +501,7 @@ pub fn create_transfer_mint_proof(
         Witness::Scalar(Value::known(token_blind)),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))

+ 1 - 1
src/contract/money/src/client/unstake_v1.rs

@@ -200,7 +200,7 @@ pub fn create_unstake_mint_proof(
         Witness::Scalar(Value::known(token_blind)),
     ];
 
-    let circuit = ZkCircuit::new(prover_witnesses, &zkbin);
+    let circuit = ZkCircuit::new(prover_witnesses, zkbin);
     let proof = Proof::create(pk, &[circuit], &public_inputs.to_vec(), &mut OsRng)?;
 
     Ok((proof, public_inputs))

+ 2 - 2
src/contract/test-harness/src/lib.rs

@@ -74,8 +74,8 @@ pub fn init_logger() {
     // We check this error so we can execute same file tests in parallel,
     // otherwise second one fails to init logger here.
     if simplelog::TermLogger::init(
-        //simplelog::LevelFilter::Info,
-        simplelog::LevelFilter::Debug,
+        simplelog::LevelFilter::Info,
+        //simplelog::LevelFilter::Debug,
         //simplelog::LevelFilter::Trace,
         cfg.build(),
         simplelog::TerminalMode::Mixed,

+ 2 - 2
src/contract/test-harness/src/vks.rs

@@ -110,8 +110,8 @@ fn read_or_gen_vks_and_pks() -> Result<(Pks, Vks)> {
         drop(f);
     }
 
-    if pks.is_some() && vks.is_some() {
-        return Ok((pks.unwrap(), vks.unwrap()))
+    if let (Some(pks), Some(vks)) = (pks, vks) {
+        return Ok((pks, vks))
     }
 
     let bins = vec![