mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2024-10-01 01:45:40 -04:00
Merge #66
66: Utility function for initializing tracing for tests r=da-kami a=da-kami Will rebase once https://github.com/comit-network/xmr-btc-swap/pull/54 merged. Co-authored-by: Daniel Karzel <daniel@comit.network>
This commit is contained in:
commit
12b7fc1196
@ -10,6 +10,8 @@ use swap::{
|
|||||||
};
|
};
|
||||||
use tempfile::tempdir;
|
use tempfile::tempdir;
|
||||||
use testcontainers::clients::Cli;
|
use testcontainers::clients::Cli;
|
||||||
|
use tracing_core::dispatcher::DefaultGuard;
|
||||||
|
use tracing_log::LogTracer;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
use xmr_btc::{alice::State0, bitcoin, config::Config, cross_curve_dleq};
|
use xmr_btc::{alice::State0, bitcoin, config::Config, cross_curve_dleq};
|
||||||
|
|
||||||
@ -17,11 +19,7 @@ use xmr_btc::{alice::State0, bitcoin, config::Config, cross_curve_dleq};
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn happy_path() {
|
async fn happy_path() {
|
||||||
use tracing_subscriber::util::SubscriberInitExt as _;
|
let _guard = init_tracing();
|
||||||
let _guard = tracing_subscriber::fmt()
|
|
||||||
.with_env_filter("swap=trace,xmr_btc=trace,monero_harness=info")
|
|
||||||
.with_ansi(false)
|
|
||||||
.set_default();
|
|
||||||
|
|
||||||
let cli = Cli::default();
|
let cli = Cli::default();
|
||||||
let bitcoind = Bitcoind::new(&cli, "0.19.1").unwrap();
|
let bitcoind = Bitcoind::new(&cli, "0.19.1").unwrap();
|
||||||
@ -126,11 +124,7 @@ async fn happy_path() {
|
|||||||
/// the encsig and fail to refund or redeem. Alice punishes.
|
/// the encsig and fail to refund or redeem. Alice punishes.
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn alice_punishes_if_bob_never_acts_after_fund() {
|
async fn alice_punishes_if_bob_never_acts_after_fund() {
|
||||||
use tracing_subscriber::util::SubscriberInitExt as _;
|
let _guard = init_tracing();
|
||||||
let _guard = tracing_subscriber::fmt()
|
|
||||||
.with_env_filter("swap=info,xmr_btc=info")
|
|
||||||
.with_ansi(false)
|
|
||||||
.set_default();
|
|
||||||
|
|
||||||
let cli = Cli::default();
|
let cli = Cli::default();
|
||||||
let bitcoind = Bitcoind::new(&cli, "0.19.1").unwrap();
|
let bitcoind = Bitcoind::new(&cli, "0.19.1").unwrap();
|
||||||
@ -379,3 +373,34 @@ async fn init_bob(
|
|||||||
bob_db,
|
bob_db,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Utility function to initialize logging in the test environment.
|
||||||
|
/// Note that you have to keep the `_guard` in scope after calling in test:
|
||||||
|
///
|
||||||
|
/// ```rust
|
||||||
|
/// let _guard = init_tracing();
|
||||||
|
/// ```
|
||||||
|
fn init_tracing() -> DefaultGuard {
|
||||||
|
// converts all log records into tracing events
|
||||||
|
// Note: Make sure to initialize without unwrapping, otherwise this causes
|
||||||
|
// trouble when running multiple tests.
|
||||||
|
let _ = LogTracer::init();
|
||||||
|
|
||||||
|
let global_filter = tracing::Level::WARN;
|
||||||
|
let swap_filter = tracing::Level::DEBUG;
|
||||||
|
let xmr_btc_filter = tracing::Level::DEBUG;
|
||||||
|
let monero_harness_filter = tracing::Level::INFO;
|
||||||
|
let bitcoin_harness_filter = tracing::Level::INFO;
|
||||||
|
|
||||||
|
use tracing_subscriber::util::SubscriberInitExt as _;
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_env_filter(format!(
|
||||||
|
"{},swap={},xmr-btc={},monero_harness={},bitcoin_harness={}",
|
||||||
|
global_filter,
|
||||||
|
swap_filter,
|
||||||
|
xmr_btc_filter,
|
||||||
|
monero_harness_filter,
|
||||||
|
bitcoin_harness_filter,
|
||||||
|
))
|
||||||
|
.set_default()
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user