Skip to content

Commit

Permalink
chore: remove tracing::info in favour of pure stdout
Browse files Browse the repository at this point in the history
  • Loading branch information
dutterbutter committed Feb 4, 2025
1 parent c607fe6 commit 36767a6
Show file tree
Hide file tree
Showing 17 changed files with 149 additions and 157 deletions.
2 changes: 1 addition & 1 deletion crates/api_server/src/impls/anvil.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl AnvilNamespaceServer for AnvilNamespace {
}

Check warning on line 100 in crates/api_server/src/impls/anvil.rs

View workflow job for this annotation

GitHub Actions / lint

Diff in /home/runner/work/anvil-zksync/anvil-zksync/crates/api_server/src/impls/anvil.rs

async fn set_min_gas_price(&self, _gas: U256) -> RpcResult<()> {
tracing::info!(
println!(
"Setting minimum gas price is unsupported as ZKsync is a post-EIP1559 chain"
);
Err(RpcError::Unsupported.into())
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/bytecode_override.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub async fn override_bytecodes(node: &InMemoryNode, bytecodes_dir: String) -> a
node.override_bytecode(address, bytecode)
.await
.expect("Failed to override bytecode");
tracing::info!("+++++ Replacing bytecode at address {:?} +++++", address);
println!("Replacing bytecode at address {:?}", address);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions crates/cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ async fn main() -> anyhow::Result<()> {
SystemContractsOptions::Local
) {
if let Some(path) = env::var_os("ZKSYNC_HOME") {
tracing::info!("+++++ Reading local contracts from {:?} +++++", path);
println!("Reading local contracts from {:?}", path);
}
}

Expand Down Expand Up @@ -313,7 +313,7 @@ async fn main() -> anyhow::Result<()> {
server_handles.push(server.run());
}
Err(err) => {

Check warning on line 315 in crates/cli/src/main.rs

View workflow job for this annotation

GitHub Actions / lint

Diff in /home/runner/work/anvil-zksync/anvil-zksync/crates/cli/src/main.rs
tracing::info!(
println!(
"Failed to bind to address {}:{}: {}. Retrying with a different port...",
host,
config.port,
Expand All @@ -325,7 +325,7 @@ async fn main() -> anyhow::Result<()> {
match server_builder.clone().build(addr).await {
Ok(server) => {
config.port = server.local_addr().port();

Check warning on line 327 in crates/cli/src/main.rs

View workflow job for this annotation

GitHub Actions / lint

Diff in /home/runner/work/anvil-zksync/anvil-zksync/crates/cli/src/main.rs
tracing::info!(
println!(
"Successfully started server on port {} for host {}",
config.port,
host
Expand Down
94 changes: 47 additions & 47 deletions crates/config/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,84 +230,84 @@ impl TestNodeConfig {

println!("{}", BANNER.custom_color(color));

tracing::info!("Version: {}", VERSION_MESSAGE.green());
tracing::info!(
println!("Version: {}", VERSION_MESSAGE.green());
println!(
"Repository: {}",
"https://github.com/matter-labs/anvil-zksync".green()
);
println!("\n");

tracing::info!("Rich Accounts");
tracing::info!("========================");
println!("Rich Accounts");
println!("========================");
let balance = format_eth(self.genesis_balance);
for (idx, account) in self.genesis_accounts.iter().enumerate() {
tracing::info!("({}) {} ({balance})", idx, account.address());
println!("({}) {} ({balance})", idx, account.address());
}
println!("\n");

tracing::info!("Private Keys");
tracing::info!("========================");
println!("Private Keys");
println!("========================");
for (idx, account) in self.genesis_accounts.iter().enumerate() {
let private_key = hex::encode(account.credential().to_bytes());
tracing::info!("({}) 0x{}", idx, private_key);
println!("({}) 0x{}", idx, private_key);
}
println!("\n");

if let Some(ref generator) = self.account_generator {
tracing::info!("Wallet");
tracing::info!("========================");
tracing::info!("Mnemonic: {}", generator.get_phrase().green());
tracing::info!(
println!("Wallet");
println!("========================");
println!("Mnemonic: {}", generator.get_phrase().green());
println!(
"Derivation path: {}",
generator.get_derivation_path().green()
);
}
println!("\n");

if let Some(fd) = fork_details {
tracing::info!("Fork Details");
tracing::info!("========================");
tracing::info!("Network RPC: {}", fd.network_rpc.green());
tracing::info!(
println!("Fork Details");
println!("========================");
println!("Network RPC: {}", fd.network_rpc.green());
println!(
"Chain ID: {}",
self.get_chain_id().to_string().green()
);
tracing::info!("L1 Batch #: {}", fd.l1_block.green());
tracing::info!("L2 Block #: {}", fd.l2_block.green());
tracing::info!(
println!("L1 Batch #: {}", fd.l1_block.green());
println!("L2 Block #: {}", fd.l2_block.green());
println!(
"Block Timestamp: {}",
fd.block_timestamp.to_string().green()
);
tracing::info!(
println!(
"Fork Block Hash: {}",
format!("{:#}", fd.fork_block_hash).green()
);
tracing::info!(
println!(
"Compute Overhead Part: {}",
fd.fee_model_config_v2
.compute_overhead_part
.to_string()
.green()
);
tracing::info!(
println!(
"Pubdata Overhead Part: {}",
fd.fee_model_config_v2
.pubdata_overhead_part
.to_string()
.green()
);
tracing::info!(
println!(
"Batch Overhead L1 Gas: {}",
fd.fee_model_config_v2
.batch_overhead_l1_gas
.to_string()
.green()
);
tracing::info!(
println!(
"Max Gas Per Batch: {}",
fd.fee_model_config_v2.max_gas_per_batch.to_string().green()
);
tracing::info!(
println!(
"Max Pubdata Per Batch: {}",
fd.fee_model_config_v2
.max_pubdata_per_batch
Expand All @@ -316,9 +316,9 @@ impl TestNodeConfig {
);
println!("\n");
} else {
tracing::info!("Network Configuration");
tracing::info!("========================");
tracing::info!(
println!("Network Configuration");
println!("========================");
println!(
"Chain ID: {}",
self.chain_id
.unwrap_or(TEST_NODE_NETWORK_ID)
Expand All @@ -327,55 +327,55 @@ impl TestNodeConfig {
);
println!("\n");
}
tracing::info!("Gas Configuration");
tracing::info!("========================");
tracing::info!(
println!("Gas Configuration");
println!("========================");
println!(
"L1 Gas Price (gwei): {}",
format_gwei(self.get_l1_gas_price().into()).green()
);
tracing::info!(
println!(
"L2 Gas Price (gwei): {}",
format_gwei(self.get_l2_gas_price().into()).green()
);
tracing::info!(
println!(
"L1 Pubdata Price (gwei): {}",
format_gwei(self.get_l1_pubdata_price().into()).green()
);
tracing::info!(
println!(
"Estimated Gas Price Scale Factor: {}",
self.get_price_scale().to_string().green()
);
tracing::info!(
println!(
"Estimated Gas Limit Scale Factor: {}",
self.get_gas_limit_scale().to_string().green()
);
println!("\n");

tracing::info!("Genesis Timestamp");
tracing::info!("========================");
tracing::info!("{}", self.get_genesis_timestamp().to_string().green());
println!("Genesis Timestamp");
println!("========================");
println!("{}", self.get_genesis_timestamp().to_string().green());
println!("\n");

tracing::info!("Node Configuration");
tracing::info!("========================");
tracing::info!("Port: {}", self.port);
tracing::info!(
println!("Node Configuration");
println!("========================");
println!("Port: {}", self.port);
println!(
"EVM Emulator: {}",
if self.use_evm_emulator {
"Enabled".green()
} else {
"Disabled".red()
}
);
tracing::info!(
println!(
"Health Check Endpoint: {}",
if self.health_check_endpoint {
"Enabled".green()
} else {
"Disabled".red()
}
);
tracing::info!(
println!(
"ZK OS: {}",
if self.use_zkos {
"Enabled".green()
Expand All @@ -385,15 +385,15 @@ impl TestNodeConfig {
);

println!("\n");
tracing::info!("========================================");
println!("========================================");
for host in &self.host {
tracing::info!(
println!(
" Listening on {}:{}",
host.to_string().green(),
self.port.to_string().green()
);
}
tracing::info!("========================================");
println!("========================================");
println!("\n");
}

Expand Down
7 changes: 4 additions & 3 deletions crates/core/src/console_log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ impl ConsoleLogHandler {
}

if !messages.is_empty() {
tracing::info!("");
tracing::info!("==== Console logs: ");
println!("");
println!("Logs: ");
}
for message in messages {
tracing::info!("{}", message.cyan());
println!("{}", message.bold());
}
println!("");
}
pub fn handle_call_recursive(&self, current_call: &Call, messages: &mut Vec<String>) {
if let Some(message) = self.handle_call(current_call) {
Expand Down
8 changes: 4 additions & 4 deletions crates/core/src/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ impl EthFilters {
}),
);

tracing::info!("created block filter '{:#x}'", self.id_counter);
println!("created block filter '{:#x}'", self.id_counter);
Ok(self.id_counter)
}

Expand All @@ -134,7 +134,7 @@ impl EthFilters {
})),
);

tracing::info!("created log filter '{:#x}'", self.id_counter);
println!("created log filter '{:#x}'", self.id_counter);
Ok(self.id_counter)
}

Expand All @@ -151,7 +151,7 @@ impl EthFilters {
}),
);

tracing::info!(
println!(
"created pending transaction filter '{:#x}'",
self.id_counter
);
Expand All @@ -160,7 +160,7 @@ impl EthFilters {

/// Removes the filter with the given id. Returns true if the filter existed, false otherwise.
pub fn remove_filter(&mut self, id: U256) -> bool {
tracing::info!("removing filter '{id:#x}'");
println!("removing filter '{id:#x}'");
self.filters.remove(&id).is_some()
}

Expand Down
18 changes: 9 additions & 9 deletions crates/core/src/formatter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ impl Formatter {
/// Logs a formatted message with a hierarchical prefix.
pub fn format_log(&self, is_last_sibling: bool, message: &str) {
let prefix = build_prefix(&self.sibling_stack, is_last_sibling);
tracing::info!("{}{}", prefix, message);
println!("{}{}", prefix, message);
}
/// Logs a formatted error message with a hierarchical prefix.
pub fn format_error(&self, is_last_sibling: bool, message: &str) {
let prefix = build_prefix(&self.sibling_stack, is_last_sibling);
tracing::info!("{}", format!("{}{}", prefix, message).red());
println!("{}", format!("{}{}", prefix, message).red());
}
/// Prints gas details for the transaction in a structured log.
pub fn print_gas_details(
Expand Down Expand Up @@ -590,7 +590,7 @@ impl Formatter {
}
/// Prints the VM execution results in a structured log.
pub fn print_vm_details(&mut self, result: &VmExecutionResultAndLogs) {
tracing::info!("");
println!("");

self.section("[VM Execution Results]", true, |section| {
let stats = [
Expand Down Expand Up @@ -843,20 +843,20 @@ pub fn print_transaction_summary(
_ => "⚠️",
};

tracing::info!("{} [{}] Hash: {:?}", emoji, status, tx.hash());
tracing::info!("Initiator: {:?}", tx.initiator_account());
tracing::info!("Payer: {:?}", tx.payer());
tracing::info!(
println!("{} [{}] Hash: {:?}", emoji, status, tx.hash());
println!("Initiator: {:?}", tx.initiator_account());
println!("Payer: {:?}", tx.payer());
println!(
"Gas Limit: {} | Used: {} | Refunded: {}",
to_human_size(tx.gas_limit()),
to_human_size(used_gas),
to_human_size(tx_result.refunds.gas_refunded.into())
);
tracing::info!(
println!(
"Paid: {:.10} ETH ({} gas * {})",
paid_in_eth,
used_gas,
format_gwei(l2_gas_price.into())
);
tracing::info!("Refunded: {:.10} ETH", refunded_in_eth);
println!("Refunded: {:.10} ETH", refunded_in_eth);
}
4 changes: 2 additions & 2 deletions crates/core/src/node/eth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl InMemoryNode {
message
);

tracing::info!("{}", pretty_message.on_red());
println!("{}", pretty_message.on_red());
Err(Web3Error::SubmitTransactionError(
pretty_message,
output.encoded_data(),
Expand All @@ -69,7 +69,7 @@ impl InMemoryNode {
message
);

tracing::info!("{}", pretty_message.on_red());
println!("{}", pretty_message.on_red());
Err(Web3Error::SubmitTransactionError(pretty_message, vec![]))
}
}
Expand Down
Loading

0 comments on commit 36767a6

Please sign in to comment.