Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
kroist committed Jan 31, 2025
1 parent e69f681 commit 1b75faf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
15 changes: 7 additions & 8 deletions crates/integration-tests/src/bin/gas_consumption.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ use integration_tests::{
},
},
deploy::{deployment, Deployment},
deposit_native_proving_params, new_account_native_proving_params,
withdraw_native_proving_params,
deposit_proving_params, new_account_proving_params, withdraw_proving_params,
};
use shielder_account::ShielderAccount;
use shielder_contract::ShielderContract::{
Expand All @@ -34,9 +33,9 @@ enum Calldata {
impl fmt::Display for Calldata {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
Calldata::NewAccount(_) => write!(f, "NewAccountNative"),
Calldata::Deposit(_) => write!(f, "DepositNative"),
Calldata::Withdraw(_) => write!(f, "WithdrawNative"),
Calldata::NewAccount(_) => write!(f, "NewAccount"),
Calldata::Deposit(_) => write!(f, "Deposit"),
Calldata::Withdraw(_) => write!(f, "Withdraw"),
}
}
}
Expand All @@ -47,9 +46,9 @@ fn main() {
let mut file = File::create(filename).unwrap();

let mut deployment = deployment(
&new_account_native_proving_params(),
&deposit_native_proving_params(),
&withdraw_native_proving_params(),
&new_account_proving_params(),
&deposit_proving_params(),
&withdraw_proving_params(),
);

let mut shielder_account = ShielderAccount::new(U256::from(1));
Expand Down
12 changes: 6 additions & 6 deletions crates/integration-tests/src/proving_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,21 @@ pub type ProvingParams = (Params, ProvingKey);

#[fixture]
#[once]
pub fn new_account_native_proving_params() -> ProvingParams {
println!("Preparing NewAccountNative proving keys");
pub fn new_account_proving_params() -> ProvingParams {
println!("Preparing NewAccount proving keys");
prepare_proving_keys::<NewAccountCircuit<F>>()
}

#[fixture]
#[once]
pub fn deposit_native_proving_params() -> ProvingParams {
println!("Preparing DepositNative proving keys");
pub fn deposit_proving_params() -> ProvingParams {
println!("Preparing Deposit proving keys");
prepare_proving_keys::<DepositCircuit<F, RANGE_PROOF_CHUNK_SIZE>>()
}

#[fixture]
#[once]
pub fn withdraw_native_proving_params() -> ProvingParams {
println!("Preparing WithdrawNative proving keys");
pub fn withdraw_proving_params() -> ProvingParams {
println!("Preparing Withdraw proving keys");
prepare_proving_keys::<WithdrawCircuit<F, RANGE_PROOF_CHUNK_SIZE>>()
}

0 comments on commit 1b75faf

Please sign in to comment.