From 818f58e2f91b0210be6cf48eb51a40b441c5d451 Mon Sep 17 00:00:00 2001 From: Rostyslav Tyshko Date: Fri, 7 Feb 2025 15:17:55 -0500 Subject: [PATCH] fmt --- node_core/src/lib.rs | 31 ++++++++----------------------- zkvm/src/lib.rs | 37 ++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/node_core/src/lib.rs b/node_core/src/lib.rs index 6722968..946908c 100644 --- a/node_core/src/lib.rs +++ b/node_core/src/lib.rs @@ -474,7 +474,9 @@ impl NodeCore { .viewing_secret_key .to_bytes() .to_vec(), - ).map_err(|err| anyhow!("{:?}", err)).map_err(ExecutionFailureKind::write_error)?, + ) + .map_err(|err| anyhow!("{:?}", err)) + .map_err(ExecutionFailureKind::write_error)?, generator_blinding_factor: Tweak::new(&mut thread_rng()), }; @@ -780,10 +782,7 @@ impl NodeCore { let acc = write_guard.acc_map.get_mut(&acc_addr).unwrap(); - acc.utxo_tree - .get_item(new_utxo_hash)? - .unwrap() - .clone() + acc.utxo_tree.get_item(new_utxo_hash)?.unwrap().clone() }; new_utxo.log(); @@ -960,10 +959,7 @@ impl NodeCore { let acc = write_guard.acc_map.get_mut(&acc_addr_rec).unwrap(); acc.log(); - acc.utxo_tree - .get_item(new_utxo_hash)? - .unwrap() - .clone() + acc.utxo_tree.get_item(new_utxo_hash)?.unwrap().clone() }; new_utxo.log(); info!( @@ -1003,10 +999,7 @@ impl NodeCore { let acc = write_guard.acc_map.get_mut(&acc_addr_rec).unwrap(); acc.log(); - acc.utxo_tree - .get_item(new_utxo_hash)? - .unwrap() - .clone() + acc.utxo_tree.get_item(new_utxo_hash)?.unwrap().clone() }; new_utxo.log(); info!( @@ -1051,11 +1044,7 @@ impl NodeCore { let acc = write_guard.acc_map.get_mut(&acc_addr_rec).unwrap(); acc.log(); - let new_utxo = acc - .utxo_tree - .get_item(new_utxo_hash)? - .unwrap() - .clone(); + let new_utxo = acc.utxo_tree.get_item(new_utxo_hash)?.unwrap().clone(); new_utxo.log(); info!( @@ -1075,11 +1064,7 @@ impl NodeCore { let acc = write_guard.acc_map.get_mut(&acc_addr).unwrap(); acc.log(); - let new_utxo = acc - .utxo_tree - .get_item(new_utxo_hash)? - .unwrap() - .clone(); + let new_utxo = acc.utxo_tree.get_item(new_utxo_hash)?.unwrap().clone(); new_utxo.log(); info!( diff --git a/zkvm/src/lib.rs b/zkvm/src/lib.rs index 19fa8be..a3dcf82 100644 --- a/zkvm/src/lib.rs +++ b/zkvm/src/lib.rs @@ -56,7 +56,10 @@ pub fn prove_mint_utxo( let digest: UTXOPayload = receipt.journal.decode()?; - Ok((UTXO::create_utxo_from_payload(digest).map_err(ExecutionFailureKind::write_error)?, receipt)) + Ok(( + UTXO::create_utxo_from_payload(digest).map_err(ExecutionFailureKind::write_error)?, + receipt, + )) } pub fn prove_send_utxo( @@ -96,7 +99,8 @@ pub fn prove_send_utxo( digest .into_iter() .map(|(payload, addr)| (UTXO::create_utxo_from_payload(payload).map(|sel| (sel, addr)))) - .collect::>>().map_err(ExecutionFailureKind::write_error)?, + .collect::>>() + .map_err(ExecutionFailureKind::write_error)?, receipt, )) } @@ -144,12 +148,14 @@ pub fn prove_send_utxo_multiple_assets_one_receiver( .0 .into_iter() .map(|payload| UTXO::create_utxo_from_payload(payload)) - .collect::>>().map_err(ExecutionFailureKind::write_error)?, + .collect::>>() + .map_err(ExecutionFailureKind::write_error)?, digest .1 .into_iter() .map(|payload| UTXO::create_utxo_from_payload(payload)) - .collect::>>().map_err(ExecutionFailureKind::write_error)?, + .collect::>>() + .map_err(ExecutionFailureKind::write_error)?, receipt, )) } @@ -170,7 +176,8 @@ pub fn prove_send_utxo_shielded( asset: vec![], amount, privacy_flag: true, - }).map_err(ExecutionFailureKind::write_error)?; + }) + .map_err(ExecutionFailureKind::write_error)?; let utxo_payload = temp_utxo_to_spend.into_payload(); let mut builder = ExecutorEnv::builder(); @@ -199,7 +206,8 @@ pub fn prove_send_utxo_shielded( digest .into_iter() .map(|(payload, addr)| (UTXO::create_utxo_from_payload(payload).map(|sel| (sel, addr)))) - .collect::>>().map_err(ExecutionFailureKind::write_error)?, + .collect::>>() + .map_err(ExecutionFailureKind::write_error)?, receipt, )) } @@ -280,7 +288,8 @@ pub fn prove_mint_utxo_multiple_assets( digest .into_iter() .map(UTXO::create_utxo_from_payload) - .collect::>>().map_err(ExecutionFailureKind::write_error)?, + .collect::>>() + .map_err(ExecutionFailureKind::write_error)?, receipt, )) } @@ -319,8 +328,7 @@ pub fn execute_send_utxo( let receipt = executor.execute(env, test_methods::SEND_UTXO_ELF)?; - let digest: (UTXOPayload, Vec<(UTXOPayload, AccountAddress)>) = - receipt.journal.decode()?; + let digest: (UTXOPayload, Vec<(UTXOPayload, AccountAddress)>) = receipt.journal.decode()?; Ok(( UTXO::create_utxo_from_payload(digest.0)?, @@ -328,11 +336,15 @@ pub fn execute_send_utxo( .1 .into_iter() .map(|(payload, addr)| (UTXO::create_utxo_from_payload(payload).map(|sel| (sel, addr)))) - .collect::>>().map_err(ExecutionFailureKind::write_error)?, + .collect::>>() + .map_err(ExecutionFailureKind::write_error)?, )) } -pub fn prove(input_vec: Vec, elf: &[u8]) -> anyhow::Result<(u64, Receipt)> { +pub fn prove( + input_vec: Vec, + elf: &[u8], +) -> anyhow::Result<(u64, Receipt)> { let mut builder = ExecutorEnv::builder(); for input in input_vec { @@ -372,8 +384,7 @@ pub fn execute serde::Deserialize<'de>>( } pub fn verify(receipt: Receipt, image_id: impl Into) -> anyhow::Result<()> { - Ok(receipt - .verify(image_id)?) + Ok(receipt.verify(image_id)?) } #[cfg(test)]