From 8ea17e1d9cee5ddf7e59d2d10daa801ab17bbe65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Litteri?= Date: Fri, 15 Dec 2023 17:58:01 -0300 Subject: [PATCH] zk fmt --- core/lib/zksync_core/src/lib.rs | 3 +-- infrastructure/zk/src/hyperchain_wizard.ts | 4 ++-- infrastructure/zk/src/init.ts | 12 +++++++++--- zksync_full_stack/src/main.rs | 18 +++++++++--------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/core/lib/zksync_core/src/lib.rs b/core/lib/zksync_core/src/lib.rs index a44fbfec469..8e02098dd59 100644 --- a/core/lib/zksync_core/src/lib.rs +++ b/core/lib/zksync_core/src/lib.rs @@ -1,7 +1,6 @@ #![allow(clippy::upper_case_acronyms, clippy::derive_partial_eq_without_eq)] -use std::env; -use std::{net::Ipv4Addr, str::FromStr, sync::Arc, time::Instant}; +use std::{env, net::Ipv4Addr, str::FromStr, sync::Arc, time::Instant}; use anyhow::Context as _; use futures::channel::oneshot; diff --git a/infrastructure/zk/src/hyperchain_wizard.ts b/infrastructure/zk/src/hyperchain_wizard.ts index 97664ac7b0a..54b4c5f82c4 100644 --- a/infrastructure/zk/src/hyperchain_wizard.ts +++ b/infrastructure/zk/src/hyperchain_wizard.ts @@ -68,7 +68,7 @@ async function initHyperchain() { deploy: deployTestTokens, args: ['--private-key', deployerPrivateKey, '--envFile', process.env.CHAIN_ETH_NETWORK!] }, - validium: false, + validium: false }; await init(initArgs); @@ -801,7 +801,7 @@ async function configDemoHyperchain(cmd: Command) { deploy: deployTestTokens, args: ['--private-key', deployerPrivateKey, '--envFile', process.env.CHAIN_ETH_NETWORK!] }, - validium: cmd.validium, + validium: cmd.validium }; if (!cmd.skipEnvSetup) { diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts index bf3434a04ec..a5e1ebb4649 100644 --- a/infrastructure/zk/src/init.ts +++ b/infrastructure/zk/src/init.ts @@ -18,8 +18,14 @@ const success = chalk.green; const timestamp = chalk.grey; export async function init(initArgs: InitArgs = DEFAULT_ARGS) { - const { skipSubmodulesCheckout, skipEnvSetup, testTokens, governorPrivateKeyArgs, deployerL2ContractInput, validium } = - initArgs; + const { + skipSubmodulesCheckout, + skipEnvSetup, + testTokens, + governorPrivateKeyArgs, + deployerL2ContractInput, + validium + } = initArgs; if (!process.env.CI && !skipEnvSetup) { await announced('Pulling images', docker.pull()); @@ -176,7 +182,7 @@ export const initCommand = new Command('init') governorPrivateKeyArgs: [], deployerL2ContractInput: { args: [], includePaymaster: true, includeL2WETH: true }, testTokens: { deploy: true, args: [] }, - validium: cmd.validium, + validium: cmd.validium }; await init(initArgs); }); diff --git a/zksync_full_stack/src/main.rs b/zksync_full_stack/src/main.rs index 1c0df399150..f6deb5d9e81 100644 --- a/zksync_full_stack/src/main.rs +++ b/zksync_full_stack/src/main.rs @@ -1,13 +1,13 @@ -use ethers::abi::Abi; -use ethers::providers::Http; -use ethers::utils::parse_units; use std::str::FromStr; -use zksync_web3_rs::providers::{Middleware, Provider}; -use zksync_web3_rs::signers::{LocalWallet, Signer}; -use zksync_web3_rs::zks_provider::ZKSProvider; -use zksync_web3_rs::zks_wallet::CallRequest; -use zksync_web3_rs::zks_wallet::{DeployRequest, DepositRequest}; -use zksync_web3_rs::ZKSWallet; + +use ethers::{abi::Abi, providers::Http, utils::parse_units}; +use zksync_web3_rs::{ + providers::{Middleware, Provider}, + signers::{LocalWallet, Signer}, + zks_provider::ZKSProvider, + zks_wallet::{CallRequest, DeployRequest, DepositRequest}, + ZKSWallet, +}; static ERA_PROVIDER_URL: &str = "http://127.0.0.1:3050"; static PRIVATE_KEY: &str = "7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110";