Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip: add env filter

Browse Source
This commit is contained in:
Tobin C. Harding 2020-10-29 11:36:57 +11:00 committed by Lucas Soriano del Pino
parent 3e2f0b74a2
commit b8ab4b4eee
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swap/Cargo.toml
View File

@ -12,7 +12,7 @@ atty = "0.2"
backoff = { version = "0.2", features = ["tokio"] } backoff = { version = "0.2", features = ["tokio"] }
base64 = "0.12" base64 = "0.12"
bitcoin = { version = "0.23", features = ["rand", "use-serde"] } # TODO: Upgrade other crates in this repo to use this version. bitcoin = { version = "0.23", features = ["rand", "use-serde"] } # TODO: Upgrade other crates in this repo to use this version.
bitcoin-harness = { git = "https://github.com/coblox/bitcoin-harness-rs", rev = "7ff30a559ab57cc3aa71189e71433ef6b2a6c3a2" } bitcoin-harness = { git = "https://github.com/coblox/bitcoin-harness-rs", rev = "b56ac243eade11e817aa670d546892852a609e7d" }
derivative = "2" derivative = "2"
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
genawaiter = "0.99.1" genawaiter = "0.99.1"

9
swap/src/network/request_response.rs
View File

@ -70,7 +70,7 @@ impl RequestResponseCodec for Codec {
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?; .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
let mut de = serde_cbor::Deserializer::from_slice(&message); let mut de = serde_cbor::Deserializer::from_slice(&message);
let msg = BobToAlice::deserialize(&mut de) let msg = BobToAlice::deserialize(&mut de)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?; .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
Ok(msg) Ok(msg)
} }
@ -102,8 +102,11 @@ impl RequestResponseCodec for Codec {
where where
T: AsyncWrite + Unpin + Send, T: AsyncWrite + Unpin + Send,
{ {
let bytes = let bytes = serde_cbor::to_vec(&req).map_err(|e| {
serde_cbor::to_vec(&req).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?; tracing::debug!("yes Lucas we are actually here");
io::Error::new(io::ErrorKind::InvalidData, e)
})?;
upgrade::write_one(io, &bytes).await?; upgrade::write_one(io, &bytes).await?;
Ok(()) Ok(())

12
swap/tests/e2e.rs
View File

@ -1,7 +1,6 @@
use bitcoin_harness::Bitcoind; use bitcoin_harness::Bitcoind;
use futures::{channel::mpsc, future::try_join}; use futures::{channel::mpsc, future::try_join};
use libp2p::Multiaddr; use libp2p::Multiaddr;
use log::LevelFilter;
use monero_harness::Monero; use monero_harness::Monero;
use std::sync::Arc; use std::sync::Arc;
use swap::{alice, bob}; use swap::{alice, bob};
@ -11,13 +10,10 @@ use tracing_subscriber::util::SubscriberInitExt;
#[tokio::test] #[tokio::test]
async fn swap() { async fn swap() {
let _guard = tracing_subscriber::fmt() let _guard = tracing_subscriber::fmt()
.with_env_filter(format!( .with_env_filter(
"swap={},xmr_btc={},libp2p={}", "swap=debug,hyper=off,reqwest=off,monero-harness=info,testcontainers=info,libp2p=debug",
LevelFilter::Debug, )
LevelFilter::Debug, .with_ansi(true)
LevelFilter::Debug
))
.with_ansi(false)
.set_default(); .set_default();
let alice_multiaddr: Multiaddr = "/ip4/127.0.0.1/tcp/9876" let alice_multiaddr: Multiaddr = "/ip4/127.0.0.1/tcp/9876"