Remove unnecessary log dependency

By updating `tracing_log`, we can access the re-export. That we need
to initialize the `tracing_log` adaptor.

The usage of `log::LevelFilter` for the `init_tracing` function was
conceptually incorrect. We should be using a type from the `tracing`
library here.

Cargo.lock

@@ -1836,7 +1836,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
 dependencies = [
  "cfg-if 0.1.10",
- "serde",
 ]
 
 [[package]]
@@ -3467,7 +3466,6 @@ dependencies = [
  "hyper",
  "libp2p",
  "libp2p-async-await",
- "log",
  "miniscript",
  "monero",
  "monero-harness",
@@ -3832,9 +3830,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9"
+checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
 dependencies = [
  "lazy_static",
  "log",

swap/Cargo.toml

@@ -29,7 +29,6 @@ ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["libse
 futures = { version = "0.3", default-features = false }
 libp2p = { version = "0.34", default-features = false, features = ["tcp-tokio", "yamux", "mplex", "dns", "noise", "request-response"] }
 libp2p-async-await = { git = "https://github.com/comit-network/rust-libp2p-async-await", rev = "1429cd780204624b4d244e7d8179fe6ff77988c3" }
-log = { version = "0.4", features = ["serde"] }
 miniscript = { version = "5", features = ["serde"] }
 monero = { version = "0.10", features = ["serde_support"] }
 monero-rpc = { path = "../monero-rpc" }

swap/src/bin/asb.rs

@@ -13,7 +13,6 @@
 #![allow(non_snake_case)]
 
 use anyhow::{Context, Result};
-use log::LevelFilter;
 use prettytable::{row, Table};
 use std::{path::Path, sync::Arc};
 use structopt::StructOpt;
@@ -38,6 +37,7 @@ use swap::{
     trace::init_tracing,
 };
 use tracing::{info, warn};
+use tracing_subscriber::filter::LevelFilter;
 
 #[macro_use]
 extern crate prettytable;
@@ -48,7 +48,7 @@ const MONERO_NETWORK: monero::Network = monero::Network::Stagenet;
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    init_tracing(LevelFilter::Debug).expect("initialize tracing");
+    init_tracing(LevelFilter::DEBUG).expect("initialize tracing");
 
     let opt = Arguments::from_args();
 

swap/src/bin/swap_cli.rs

@@ -13,7 +13,6 @@
 #![allow(non_snake_case)]
 
 use anyhow::{Context, Result};
-use log::LevelFilter;
 use prettytable::{row, Table};
 use std::{path::Path, sync::Arc};
 use structopt::StructOpt;
@@ -40,6 +39,7 @@ use swap::{
     trace::init_tracing,
 };
 use tracing::{error, info, warn};
+use tracing_subscriber::filter::LevelFilter;
 use uuid::Uuid;
 
 #[macro_use]
@@ -49,7 +49,7 @@ const MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME: &str = "swap-tool-blockchain-mon
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    init_tracing(LevelFilter::Debug).expect("initialize tracing");
+    init_tracing(LevelFilter::DEBUG).expect("initialize tracing");
 
     let opt = Arguments::from_args();
 

swap/src/trace.rs

@@ -1,17 +1,16 @@
 use anyhow::Result;
 use atty::{self};
-use log::LevelFilter;
 use tracing::{info, subscriber};
 use tracing_log::LogTracer;
-use tracing_subscriber::FmtSubscriber;
+use tracing_subscriber::{filter::LevelFilter, FmtSubscriber};
 
 pub fn init_tracing(level: LevelFilter) -> Result<()> {
-    if level == LevelFilter::Off {
+    if level == LevelFilter::OFF {
         return Ok(());
     }
 
     // We want upstream library log messages, just only at Info level.
-    LogTracer::init_with_filter(LevelFilter::Info)?;
+    LogTracer::init_with_filter(tracing_log::log::LevelFilter::Info)?;
 
     let is_terminal = atty::is(atty::Stream::Stderr);
     let subscriber = FmtSubscriber::builder()