chore: linting, fix formatting. Remove uneeded colorize

matter-labs · Feb 10, 2025 · 5508301 · 5508301
1 parent 85d5c9e
commit 5508301
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/crates/api_server/src/impls/anvil.rs b/crates/api_server/src/impls/anvil.rs
@@ -1,6 +1,5 @@
 use crate::error::RpcError;
 use anvil_zksync_api_decl::AnvilNamespaceServer;
-use anvil_zksync_common::sh_warn;
 use anvil_zksync_core::node::InMemoryNode;
 use anvil_zksync_types::api::{DetailedTransaction, ResetRequest};
 use anvil_zksync_types::Numeric;
@@ -101,7 +100,9 @@ impl AnvilNamespaceServer for AnvilNamespace {
     }
 
     async fn set_min_gas_price(&self, _gas: U256) -> RpcResult<()> {
-        sh_warn!("Setting minimum gas price is unsupported as ZKsync is a post-EIP1559 chain");
+        tracing::info!(
+            "Setting minimum gas price is unsupported as ZKsync is a post-EIP1559 chain"
+        );
         Err(RpcError::Unsupported.into())
     }
 

diff --git a/crates/common/src/shell.rs b/crates/common/src/shell.rs
@@ -252,7 +252,6 @@ macro_rules! sh_err {
 mod tests {
     #[test]
     fn test_shell_macros() {
-        // These calls use the global shell instance.
         sh_print!("Hello, ");
         sh_println!("world!");
         sh_eprint!("Error: ");

diff --git a/crates/core/src/formatter.rs b/crates/core/src/formatter.rs
@@ -826,13 +826,12 @@ pub fn print_transaction_summary(
     tx_result: &VmExecutionResultAndLogs,
     status: &str,
 ) {
-    // Calculate used and refunded gas.
+    // Calculate used and refunded gas
     let used_gas = tx.gas_limit() - tx_result.refunds.gas_refunded;
     let paid_in_eth = calculate_eth_cost(l2_gas_price, used_gas.as_u64());
     let refunded_gas = tx_result.refunds.gas_refunded;
     let refunded_in_eth = calculate_eth_cost(l2_gas_price, refunded_gas);
 
-    // Select an emoji based on the status.
     let emoji = match status {
         "SUCCESS" => "✅",
         "FAILED" => "❌",

diff --git a/crates/core/src/node/eth.rs b/crates/core/src/node/eth.rs
@@ -2,7 +2,6 @@ use std::collections::HashSet;
 
 use anvil_zksync_common::{sh_eprintln, sh_err};
 use anyhow::Context as _;
-use colored::Colorize;
 use zksync_multivm::interface::ExecutionResult;
 use zksync_multivm::vm_latest::constants::ETH_CALL_GAS_LIMIT;
 use zksync_types::h256_to_u256;
@@ -56,7 +55,7 @@ impl InMemoryNode {
                     message
                 );
 
-                sh_eprintln!("\n{}", pretty_message.on_red());
+                sh_eprintln!("\n{}", pretty_message);
                 Err(Web3Error::SubmitTransactionError(
                     pretty_message,
                     output.encoded_data(),
@@ -70,7 +69,7 @@ impl InMemoryNode {
                     message
                 );
 
-                sh_eprintln!("\n{}", pretty_message.on_red());
+                sh_eprintln!("\n{}", pretty_message);
                 Err(Web3Error::SubmitTransactionError(pretty_message, vec![]))
             }
         }

diff --git a/crates/core/src/node/inner/in_memory_inner.rs b/crates/core/src/node/inner/in_memory_inner.rs
@@ -29,7 +29,6 @@ use anvil_zksync_config::constants::{
 use anvil_zksync_config::TestNodeConfig;
 use anvil_zksync_types::{ShowCalls, ShowGasDetails, ShowStorageLogs, ShowVMDetails};
 use anyhow::Context;
-use colored::Colorize;
 use indexmap::IndexMap;
 use once_cell::sync::OnceCell;
 use std::collections::{HashMap, HashSet};
@@ -381,7 +380,7 @@ impl InMemoryNodeInner {
         if self.config.show_gas_details != ShowGasDetails::None {
             self.display_detailed_gas_info(bootloader_debug_result.get(), spent_on_pubdata)
                 .unwrap_or_else(|err| {
-                    sh_err!("{}", format!("Cannot display gas details: {err}").on_red());
+                    sh_err!("{}", format!("Cannot display gas details: {err}"));
                 });
         }
         // Print storage logs if enabled
@@ -924,7 +923,7 @@ impl InMemoryNodeInner {
                     message
                 );
                 let data = output.encoded_data();
-                sh_eprintln!("\n{}", pretty_message.on_red());
+                sh_eprintln!("\n{}", pretty_message);
                 Err(Web3Error::SubmitTransactionError(pretty_message, data))
             }
             ExecutionResult::Halt { reason } => {
@@ -948,7 +947,7 @@ impl InMemoryNodeInner {
                     message
                 );
 
-                sh_eprintln!("\n{}", pretty_message.on_red());
+                sh_eprintln!("\n{}", pretty_message);
                 Err(Web3Error::SubmitTransactionError(pretty_message, vec![]))
             }
             ExecutionResult::Success { .. } => {
@@ -1212,7 +1211,7 @@ impl InMemoryNodeInner {
                     .get(&o.block_hash)
                     .map(|block| block.number)
                     .ok_or_else(|| {
-                        sh_err!("unable to map block number to hash #{:#x}", o.block_hash);
+                        tracing::error!("unable to map block number to hash #{:#x}", o.block_hash);
                         Web3Error::InternalError(anyhow::Error::msg(
                             "Failed to map block number to hash.",
                         ))

diff --git a/crates/core/src/node/pool.rs b/crates/core/src/node/pool.rs
@@ -1,5 +1,4 @@
 use crate::node::impersonate::ImpersonationManager;
-use anvil_zksync_common::sh_warn;
 use anvil_zksync_types::{TransactionOrder, TransactionPriority};
 use futures::channel::mpsc::{channel, Receiver, Sender};
 use std::cmp::Ordering;