From aa9821292c1075588eea06eaaa6fda10466c7cc7 Mon Sep 17 00:00:00 2001 From: Aaron Blankstein Date: Fri, 4 Feb 2022 12:17:33 -0600 Subject: [PATCH] cargo fmt --- benches/block_limits.rs | 7 ++----- benches/large_contract_bench.rs | 24 ++++++++++++++---------- benches/marf_bench.rs | 11 +++++++++-- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/benches/block_limits.rs b/benches/block_limits.rs index 909b8a2f4..bb5c3dde4 100644 --- a/benches/block_limits.rs +++ b/benches/block_limits.rs @@ -18,7 +18,7 @@ use blockstack_lib::vm::ast::build_ast; use blockstack_lib::vm::contexts::GlobalContext; use blockstack_lib::vm::costs::LimitedCostTracker; use blockstack_lib::vm::errors::InterpreterResult; -use blockstack_lib::vm::{ContractContext, eval_all}; +use blockstack_lib::vm::{eval_all, ContractContext}; use rand::Rng; use blockstack_lib::clarity_vm::database::marf::MarfedKV; @@ -490,10 +490,7 @@ fn expensive_contract_test(scaling: u32, buildup_count: u32, genesis_size: u32) this_cost } -pub fn execute_in_epoch( - program: &str, - epoch: StacksEpochId, -) -> InterpreterResult> { +pub fn execute_in_epoch(program: &str, epoch: StacksEpochId) -> InterpreterResult> { let contract_id = QualifiedContractIdentifier::transient(); let mut contract_context = ContractContext::new(contract_id.clone()); let mut marf = MemoryBackingStore::new(); diff --git a/benches/large_contract_bench.rs b/benches/large_contract_bench.rs index c5cea6be7..0e57793f2 100644 --- a/benches/large_contract_bench.rs +++ b/benches/large_contract_bench.rs @@ -8,9 +8,7 @@ use blockstack_lib::clarity_vm::database::marf::MarfedKV; use blockstack_lib::types::chainstate::StacksBlockId; use blockstack_lib::types::proof::ClarityMarfTrieId; use blockstack_lib::vm::database::NULL_BURN_STATE_DB; -use blockstack_lib::{ - vm::database::NULL_HEADER_DB, vm::types::QualifiedContractIdentifier, -}; +use blockstack_lib::{vm::database::NULL_HEADER_DB, vm::types::QualifiedContractIdentifier}; use criterion::Criterion; pub fn rollback_log_memory_test() { @@ -47,13 +45,16 @@ pub fn rollback_log_memory_test() { } conn.as_transaction(|conn| { - let (ct_ast, _ct_analysis) = - conn.analyze_smart_contract(&contract_identifier, &contract).unwrap(); + let (ct_ast, _ct_analysis) = conn + .analyze_smart_contract(&contract_identifier, &contract) + .unwrap(); assert!(format!( "{:?}", - conn.initialize_smart_contract(&contract_identifier, &ct_ast, &contract, |_, _| false) - .unwrap_err() + conn.initialize_smart_contract(&contract_identifier, &ct_ast, &contract, |_, _| { + false + }) + .unwrap_err() ) .contains("MemoryBalanceExceeded")); }); @@ -114,9 +115,12 @@ pub fn ccall_memory_test() { let (ct_ast, ct_analysis) = conn .analyze_smart_contract(&contract_identifier, &contract) .unwrap(); - conn.initialize_smart_contract(&contract_identifier, &ct_ast, &contract, |_, _| { - false - }) + conn.initialize_smart_contract( + &contract_identifier, + &ct_ast, + &contract, + |_, _| false, + ) .unwrap(); conn.save_analysis(&contract_identifier, &ct_analysis) .unwrap(); diff --git a/benches/marf_bench.rs b/benches/marf_bench.rs index 63bacb48f..169796ac3 100644 --- a/benches/marf_bench.rs +++ b/benches/marf_bench.rs @@ -12,7 +12,11 @@ use std::fs; use blockstack_lib::chainstate::stacks::index::{marf::MARF, storage::TrieFileStorage}; use blockstack_lib::types::chainstate::{MARFValue, StacksBlockId}; -pub fn begin(marf: &mut MARF, chain_tip: &StacksBlockId, next_chain_tip: &StacksBlockId) -> Result<(), Error> { +pub fn begin( + marf: &mut MARF, + chain_tip: &StacksBlockId, + next_chain_tip: &StacksBlockId, +) -> Result<(), Error> { let mut tx = marf.begin_tx()?; tx.begin(chain_tip, next_chain_tip)?; Ok(()) @@ -63,7 +67,10 @@ fn benchmark_marf_usage( for _k in 0..reads_per_block { let (key, value) = values.as_slice().choose(&mut rng).unwrap(); - assert_eq!(marf.get_with_proof(&block_header, key).unwrap().unwrap().0, *value); + assert_eq!( + marf.get_with_proof(&block_header, key).unwrap().unwrap().0, + *value + ); } let mut next_block_header = (i + 1).to_le_bytes().to_vec();