From bdd0dd33627d2ed92a13210384eac4e78e4cf79d Mon Sep 17 00:00:00 2001 From: lunar-mining Date: Sat, 5 Nov 2022 12:51:16 +0100 Subject: [PATCH] cargo fmt --- example/dao/src/main.rs | 15 +++++++-------- src/consensus/clock.rs | 2 +- src/consensus/coins.rs | 7 ++++--- src/crypto/leadcoin.rs | 10 +++------- src/runtime/import/util.rs | 1 - src/sdk/src/lib.rs | 1 - src/sdk/src/tx.rs | 1 - src/sdk/src/util.rs | 1 - src/zk/circuit/lead_contract.rs | 9 ++------- 9 files changed, 17 insertions(+), 30 deletions(-) diff --git a/example/dao/src/main.rs b/example/dao/src/main.rs index 554b995cf..dc791c2c5 100644 --- a/example/dao/src/main.rs +++ b/example/dao/src/main.rs @@ -16,7 +16,10 @@ * along with this program. If not, see . */ -use std::{any::{Any, TypeId}, time::Instant}; +use std::{ + any::{Any, TypeId}, + time::Instant, +}; use incrementalmerkletree::Tree; use log::debug; @@ -1113,7 +1116,7 @@ async fn main() -> Result<()> { dao_serial, *dao::exec::FUNC_ID, dao_bulla.0, - dao_coin_blind + dao_coin_blind, ])); debug!("coin_1: {:?}", coin_1); @@ -1130,13 +1133,9 @@ async fn main() -> Result<()> { debug!("money::transfer() coin 1 = {:?}", money_transfer_coin_1); let dao_exec_call_data = tx.func_calls[1].call_data.as_any(); - let dao_exec_call_data = - dao_exec_call_data.downcast_ref::(); + let dao_exec_call_data = dao_exec_call_data.downcast_ref::(); let dao_exec_call_data = dao_exec_call_data.unwrap(); - assert_eq!( - dao_exec_call_data.type_id(), - TypeId::of::() - ); + assert_eq!(dao_exec_call_data.type_id(), TypeId::of::()); let dao_exec_coin_1 = &dao_exec_call_data.coin_1; debug!("dao::exec() coin 1 = {:?}", dao_exec_coin_1); diff --git a/src/consensus/clock.rs b/src/consensus/clock.rs index 35a6fc6f8..f16978c20 100644 --- a/src/consensus/clock.rs +++ b/src/consensus/clock.rs @@ -96,7 +96,7 @@ impl Clock { async fn ticking(&self) -> bool { let (abs, rel, _) = self.tick_time().await; debug!("abs time to genesis ticks: {}, rel ticks: {}", abs, rel); - rel < (self.tick_len)*2 / 3 + rel < (self.tick_len) * 2 / 3 } pub async fn sync(&mut self) -> Result<()> { diff --git a/src/consensus/coins.rs b/src/consensus/coins.rs index a76ed69b2..73a68b0b2 100644 --- a/src/consensus/coins.rs +++ b/src/consensus/coins.rs @@ -283,7 +283,6 @@ fn create_leadcoin( }; */ - let coin_nonce2_msg = [c_seed, c_root_sk.inner(), one.clone(), one.clone()]; let c_seed2: pallas::Base = poseidon::Hash::<_, poseidon::P128Pow5T3, poseidon::ConstantLength<4>, 3, 2>::init() @@ -333,11 +332,13 @@ fn create_coins_election_seeds( // mu_rho let nonce_mu_msg = [election_seed_nonce, eta, slot]; let nonce_mu: pallas::Base = - poseidon::Hash::<_, poseidon::P128Pow5T3, poseidon::ConstantLength<3>, 3, 2>::init().hash(nonce_mu_msg); + poseidon::Hash::<_, poseidon::P128Pow5T3, poseidon::ConstantLength<3>, 3, 2>::init() + .hash(nonce_mu_msg); // mu_y let lead_mu_msg = [election_seed_lead, eta, slot]; let lead_mu: pallas::Base = - poseidon::Hash::<_, poseidon::P128Pow5T3, poseidon::ConstantLength<3>, 3, 2>::init().hash(lead_mu_msg); + poseidon::Hash::<_, poseidon::P128Pow5T3, poseidon::ConstantLength<3>, 3, 2>::init() + .hash(lead_mu_msg); (lead_mu, nonce_mu) } diff --git a/src/crypto/leadcoin.rs b/src/crypto/leadcoin.rs index b4a09f4b7..7255d4e2a 100644 --- a/src/crypto/leadcoin.rs +++ b/src/crypto/leadcoin.rs @@ -73,14 +73,10 @@ impl LeadCoin { let po_y_y = *po_y_pt.to_affine().coordinates().unwrap().y(); let y_coord_arr = [po_y_x, po_y_y]; let po_y: pallas::Base = - poseidon::Hash::<_, poseidon::P128Pow5T3, poseidon::ConstantLength<2>, 3, 2>::init().hash(y_coord_arr); + poseidon::Hash::<_, poseidon::P128Pow5T3, poseidon::ConstantLength<2>, 3, 2>::init() + .hash(y_coord_arr); let public_inputs: [pallas::Base; LEAD_PUBLIC_INPUT_LEN] = - [ - po_nonce, - *po_pk.x(), - *po_pk.y(), - po_y - ]; + [po_nonce, *po_pk.x(), *po_pk.y(), po_y]; public_inputs } diff --git a/src/runtime/import/util.rs b/src/runtime/import/util.rs index 570792354..043702496 100644 --- a/src/runtime/import/util.rs +++ b/src/runtime/import/util.rs @@ -63,4 +63,3 @@ pub(crate) fn set_return_data(ctx: FunctionEnvMut, ptr: WasmPtr, len: u _ => -1, } } - diff --git a/src/sdk/src/lib.rs b/src/sdk/src/lib.rs index 18da00b25..7bcae1ac1 100644 --- a/src/sdk/src/lib.rs +++ b/src/sdk/src/lib.rs @@ -39,4 +39,3 @@ pub mod tx; /// Utilities pub mod util; - diff --git a/src/sdk/src/tx.rs b/src/sdk/src/tx.rs index b4c09c775..8ba408fa7 100644 --- a/src/sdk/src/tx.rs +++ b/src/sdk/src/tx.rs @@ -10,4 +10,3 @@ pub struct FuncCall { pub func_id: FuncId, pub call_data: Vec, } - diff --git a/src/sdk/src/util.rs b/src/sdk/src/util.rs index c05a153cf..8b89d837d 100644 --- a/src/sdk/src/util.rs +++ b/src/sdk/src/util.rs @@ -19,4 +19,3 @@ pub fn set_return_data(data: &[u8]) -> Result<(), ContractError> { extern "C" { fn set_return_data_(ptr: *const u8, len: u32) -> i32; } - diff --git a/src/zk/circuit/lead_contract.rs b/src/zk/circuit/lead_contract.rs index 25ec4f521..7ccae1a66 100644 --- a/src/zk/circuit/lead_contract.rs +++ b/src/zk/circuit/lead_contract.rs @@ -685,19 +685,14 @@ impl Circuit for LeadContract { layouter.assign_region( || "coin1_cm_root equality", - |mut region| { - region.constrain_equal(coin1_cm_root.cell(), coin1_commit_root.cell()) - }, + |mut region| region.constrain_equal(coin1_cm_root.cell(), coin1_commit_root.cell()), )?; layouter.assign_region( || "sn_commit equality", - |mut region| { - region.constrain_equal(sn_commit.cell(), coin1_serial.cell()) - }, + |mut region| region.constrain_equal(sn_commit.cell(), coin1_serial.cell()), )?; - // Constrain equality between witnessed and derived commitment coin2_commitment .constrain_equal(layouter.namespace(|| "coin2_commit equality"), &coin2_commit)?;