From 4e75f9826a85ae6ac824b4142d938f1acc1e25d1 Mon Sep 17 00:00:00 2001
From: Vladimir Motylenko <me@vldm.cc>
Date: Sat, 15 Jan 2022 16:39:32 +0200
Subject: [PATCH] Fix: Fix logs in evm bridge and gossip.

---
 Cargo.lock                       | 1 +
 core/src/cluster_info.rs         | 2 +-
 evm-utils/evm-bridge/Cargo.toml  | 1 +
 evm-utils/evm-bridge/src/main.rs | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0e427c695b..f3bfe4f9f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1676,6 +1676,7 @@ dependencies = [
  "solana-client",
  "solana-core",
  "solana-evm-loader-program",
+ "solana-logger 1.6.14",
  "solana-runtime",
  "solana-sdk",
  "solana-transaction-status",
diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs
index 29ccaf777d..681e3a5162 100644
--- a/core/src/cluster_info.rs
+++ b/core/src/cluster_info.rs
@@ -1764,7 +1764,7 @@ impl ClusterInfo {
         match gossip.crds.trim(cap, &keep, stakes, timestamp()) {
             Err(err) => {
                 self.stats.trim_crds_table_failed.add_relaxed(1);
-                error!("crds table trim failed: {:?}", err);
+                debug!("crds table trim failed: {:?}", err);
             }
             Ok(num_purged) => {
                 self.stats
diff --git a/evm-utils/evm-bridge/Cargo.toml b/evm-utils/evm-bridge/Cargo.toml
index 109fddd3aa..d0310090de 100644
--- a/evm-utils/evm-bridge/Cargo.toml
+++ b/evm-utils/evm-bridge/Cargo.toml
@@ -13,6 +13,7 @@ solana-core = { path = "../../core", version = "1.4.0" }
 solana-runtime = { path = "../../runtime", version = "1.4.0" }
 solana-transaction-status = { path = "../../transaction-status", version = "1.4.0" }
 solana-account-decoder = { path = "../../account-decoder", version = "1.4.0" }
+solana-logger = { path = "../../logger", version = "1.4.0" }
 solana-evm-loader-program = { path = "../programs/evm_loader" }
 structopt = { version = "0.3", features = ["paw"] }
 serde_json = "1.0.60"
diff --git a/evm-utils/evm-bridge/src/main.rs b/evm-utils/evm-bridge/src/main.rs
index 206e2c3544..903007c581 100644
--- a/evm-utils/evm-bridge/src/main.rs
+++ b/evm-utils/evm-bridge/src/main.rs
@@ -890,7 +890,7 @@ const SECRET_KEY_DUMMY: [u8; 32] = [1; 32];
 #[paw::main]
 #[tokio::main]
 async fn main(args: Args) -> StdResult<(), Box<dyn std::error::Error>> {
-    env_logger::init();
+    solana_logger::setup_with_default("info,evm=debug,rpc=trace");
     let min_gas_price = args.min_gas_price_or_default();
     let keyfile_path = args
         .keyfile