mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-02-23 08:09:53 -05:00
Fix module ambiguity in tests
This commit is contained in:
parent
36ed3a0b8b
commit
a759f39b1d
@ -1,8 +1,9 @@
|
|||||||
use crate::{
|
use crate::harness::wallet;
|
||||||
|
use bitcoin_harness::Bitcoind;
|
||||||
|
use harness::{
|
||||||
node::{AliceNode, BobNode},
|
node::{AliceNode, BobNode},
|
||||||
transport::Transport,
|
transport::Transport,
|
||||||
};
|
};
|
||||||
use bitcoin_harness::Bitcoind;
|
|
||||||
use monero_harness::Monero;
|
use monero_harness::Monero;
|
||||||
use rand::rngs::OsRng;
|
use rand::rngs::OsRng;
|
||||||
use testcontainers::clients::Cli;
|
use testcontainers::clients::Cli;
|
||||||
@ -12,9 +13,7 @@ use tokio::sync::{
|
|||||||
};
|
};
|
||||||
use xmr_btc::{alice, bitcoin, bob, monero};
|
use xmr_btc::{alice, bitcoin, bob, monero};
|
||||||
|
|
||||||
mod node;
|
mod harness;
|
||||||
mod transport;
|
|
||||||
mod wallet;
|
|
||||||
|
|
||||||
const TEN_XMR: u64 = 10_000_000_000_000;
|
const TEN_XMR: u64 = 10_000_000_000_000;
|
||||||
const RELATIVE_REFUND_TIMELOCK: u32 = 1;
|
const RELATIVE_REFUND_TIMELOCK: u32 = 1;
|
||||||
@ -146,8 +145,8 @@ pub async fn init_test<'a>(
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use crate::{
|
use crate::{
|
||||||
|
harness::node::{run_alice_until, run_bob_until},
|
||||||
init_bitcoind, init_test,
|
init_bitcoind, init_test,
|
||||||
node::{run_alice_until, run_bob_until},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use monero_harness::Monero;
|
use monero_harness::Monero;
|
||||||
|
3
xmr-btc/tests/harness/mod.rs
Normal file
3
xmr-btc/tests/harness/mod.rs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
pub mod node;
|
||||||
|
pub mod transport;
|
||||||
|
pub mod wallet;
|
@ -1,4 +1,4 @@
|
|||||||
use crate::{transport::Transport, wallet};
|
use crate::harness::{transport::Transport, wallet};
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use rand::{CryptoRng, RngCore};
|
use rand::{CryptoRng, RngCore};
|
||||||
use xmr_btc::{alice, bob};
|
use xmr_btc::{alice, bob};
|
Loading…
x
Reference in New Issue
Block a user