Просмотр исходного кода

blockchain: removed redundant code, fmt

aggstam 3 лет назад
Родитель
Сommit
b2a4b672b8
3 измененных файлов с 6 добавлено и 6 удалено
  1. 2 2
      src/blockchain/mod.rs
  2. 2 2
      src/consensus/leadcoin.rs
  3. 2 2
      src/consensus/state.rs

+ 2 - 2
src/blockchain/mod.rs

@@ -135,8 +135,8 @@ impl Blockchain {
 
         let blocks = self.blocks.get(hashes, true)?;
 
-        for (i, block) in blocks.iter().enumerate() {
-            let block = block.clone().unwrap();
+        for block in blocks {
+            let block = block.unwrap();
 
             let headers = self.headers.get(&[block.header], true)?;
             // Since we used strict get, its safe to unwrap here

+ 2 - 2
src/consensus/leadcoin.rs

@@ -33,9 +33,9 @@ use rand::rngs::OsRng;
 use super::constants::{EPOCH_LENGTH, PRF_NULLIFIER_PREFIX};
 use crate::{
     crypto::{proof::ProvingKey, Proof},
-    Result,
     zk::{vm::ZkCircuit, vm_stack::Witness},
     zkas::ZkBinary,
+    Result,
 };
 
 pub const MERKLE_DEPTH_LEADCOIN: usize = 32;
@@ -203,7 +203,7 @@ impl LeadCoin {
             sn: c_sn,
             coin1_commitment_root,
             coin1_sk_root,
-            coin1_sk_pos: u32::try_from(usize::from(coin1_sk_pos )).unwrap(),
+            coin1_sk_pos: u32::try_from(usize::from(coin1_sk_pos)).unwrap(),
             coin1_commitment_merkle_path: coin1_commitment_merkle_path.try_into().unwrap(),
             coin1_sk_merkle_path,
             coin1_blind,

+ 2 - 2
src/consensus/state.rs

@@ -50,13 +50,13 @@ use super::{
 use crate::{
     blockchain::Blockchain,
     crypto::proof::{ProvingKey, VerifyingKey},
-    zk::{vm::ZkCircuit, vm_stack::{empty_witnesses}},
-    zkas::ZkBinary,
     net,
     runtime::vm_runtime::Runtime,
     tx::Transaction,
     util::time::Timestamp,
     wallet::WalletPtr,
+    zk::{vm::ZkCircuit, vm_stack::empty_witnesses},
+    zkas::ZkBinary,
     Error, Result,
 };