narodnik 4 лет назад
Родитель
Сommit
a439466b44
2 измененных файлов с 8 добавлено и 10 удалено
  1. 8 9
      src/crypto/spend_proof.rs
  2. 0 1
      src/types.rs

+ 8 - 9
src/crypto/spend_proof.rs

@@ -5,13 +5,13 @@ use halo2_gadgets::{
     primitives,
     primitives::poseidon::{ConstantLength, P128Pow5T3},
 };
+use incrementalmerkletree::Hashable;
 use log::debug;
 use pasta_curves::{
     arithmetic::{CurveAffine, FieldExt},
     group::Curve,
     pallas,
 };
-use incrementalmerkletree::Hashable;
 
 use super::{
     nullifier::Nullifier,
@@ -66,18 +66,17 @@ impl SpendRevealedValues {
         }
 
         let merkle_root = {
-        let position: u64 = leaf_position.into();
-        let mut current = MerkleNode(coin);
-        for (level, sibling) in merkle_path.iter().enumerate() {
-            let level = level as u8;
-            current = 
-                if position & (1 << level) == 0 {
+            let position: u64 = leaf_position.into();
+            let mut current = MerkleNode(coin);
+            for (level, sibling) in merkle_path.iter().enumerate() {
+                let level = level as u8;
+                current = if position & (1 << level) == 0 {
                     MerkleNode::combine(level.into(), &current, sibling)
                 } else {
                     MerkleNode::combine(level.into(), sibling, &current)
                 };
-        }
-        current
+            }
+            current
         };
 
         let value_commit = pedersen_commitment_u64(value, value_blind);

+ 0 - 1
src/types.rs

@@ -27,4 +27,3 @@ pub type DrkSecretKey = pallas::Base;
 pub fn derive_public_key(s: DrkSecretKey) -> DrkPublicKey {
     OrchardFixedBases::NullifierK.generator() * mod_r_p(s)
 }
-