From 03dee7a3ea350d1955c66cb5d129ce1a02958a5c Mon Sep 17 00:00:00 2001 From: rishflab Date: Thu, 22 Oct 2020 19:34:53 +1100 Subject: [PATCH] Generate temp dir for db --- xmr-btc/tests/e2e.rs | 10 ++++++---- xmr-btc/tests/harness/storage.rs | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xmr-btc/tests/e2e.rs b/xmr-btc/tests/e2e.rs index b6d51217..98378ee0 100644 --- a/xmr-btc/tests/e2e.rs +++ b/xmr-btc/tests/e2e.rs @@ -11,7 +11,6 @@ mod tests { harness::{ init_bitcoind, init_test, node::{run_alice_until, run_bob_until}, - ALICE_TEST_DB_FOLDER, BOB_TEST_DB_FOLDER, }, }; use futures::future; @@ -19,7 +18,7 @@ mod tests { use rand::rngs::OsRng; use crate::harness::storage::Database; - use std::{convert::TryInto, path::Path}; + use std::convert::TryInto; use testcontainers::clients::Cli; use tracing_subscriber::util::SubscriberInitExt; use xmr_btc::{ @@ -252,10 +251,13 @@ mod tests { let cli = Cli::default(); let (monero, _container) = Monero::new(&cli); let bitcoind = init_bitcoind(&cli).await; + + let alice_db_dir = tempfile::tempdir().unwrap(); let alice_db: Database = - harness::storage::Database::open(Path::new(ALICE_TEST_DB_FOLDER)).unwrap(); + harness::storage::Database::open(alice_db_dir.path()).unwrap(); + let bob_db_dir = tempfile::tempdir().unwrap(); let bob_db: Database = - harness::storage::Database::open(Path::new(BOB_TEST_DB_FOLDER)).unwrap(); + harness::storage::Database::open(bob_db_dir.path()).unwrap(); let ( alice_state0, diff --git a/xmr-btc/tests/harness/storage.rs b/xmr-btc/tests/harness/storage.rs index 7b53c93b..4b46c9d3 100644 --- a/xmr-btc/tests/harness/storage.rs +++ b/xmr-btc/tests/harness/storage.rs @@ -105,7 +105,8 @@ mod tests { #[tokio::test] async fn recover_state_from_db() { - let db = Database::open(Path::new("../target/test_recover.db")).unwrap(); + let db_dir = tempfile::tempdir().unwrap(); + let db = Database::open(db_dir.path()).unwrap(); let a = xmr_btc::bitcoin::SecretKey::new_random(&mut OsRng); let s_a = cross_curve_dleq::Scalar::random(&mut OsRng);