Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-09-27 20:05:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Tor feature flag and only run test if enabled

Browse Source
This commit is contained in:
Philipp Hoenisch 2020-10-20 14:33:32 +11:00
parent 5e19949d71
commit 295216a8ee
No known key found for this signature in database
GPG Key ID: E5F8E74C672BC666
4 changed files with 77 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -46,6 +46,9 @@ jobs:
build_test: build_test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Install tor
run: sudo apt-get tor
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v2 uses: actions/checkout@v2

6
xmr-btc/Cargo.toml
View File

@ -22,7 +22,7 @@ serde_json = "1"
sha2 = "0.9" sha2 = "0.9"
thiserror = "1" thiserror = "1"
tokio = { version = "0.2", default-features = false, features = ["blocking", "macros", "rt-core", "time", "rt-threaded"] } tokio = { version = "0.2", default-features = false, features = ["blocking", "macros", "rt-core", "time", "rt-threaded"] }
torut = "0.1" torut = { version = "0.1", optional = true }
tracing = "0.1" tracing = "0.1"
[dev-dependencies] [dev-dependencies]
@ -35,3 +35,7 @@ spectral = "0.6"
testcontainers = "0.10" testcontainers = "0.10"
tracing = "0.1" tracing = "0.1"
tracing-subscriber = "0.2" tracing-subscriber = "0.2"
[features]
default = []
tor = ["torut"]

1
xmr-btc/src/lib.rs
View File

@ -49,5 +49,6 @@ pub mod alice;
pub mod bitcoin; pub mod bitcoin;
pub mod bob; pub mod bob;
pub mod monero; pub mod monero;
#[cfg(feature = "tor")]
pub mod tor; pub mod tor;
pub mod transport; pub mod transport;

7
xmr-btc/tests/tor.rs
View File

@ -1,3 +1,6 @@
#[cfg(feature = "tor")]
mod tor_test {
use anyhow::Result; use anyhow::Result;
use hyper::service::{make_service_fn, service_fn}; use hyper::service::{make_service_fn, service_fn};
use reqwest::StatusCode; use reqwest::StatusCode;
@ -14,7 +17,8 @@ async fn hello_world(
} }
fn start_test_service(port: u16, rx: Receiver<()>) { fn start_test_service(port: u16, rx: Receiver<()>) {
let make_svc = make_service_fn(|_conn| async { Ok::<_, Infallible>(service_fn(hello_world)) }); let make_svc =
make_service_fn(|_conn| async { Ok::<_, Infallible>(service_fn(hello_world)) });
let addr = ([127, 0, 0, 1], port).into(); let addr = ([127, 0, 0, 1], port).into();
let server = hyper::Server::bind(&addr).serve(make_svc); let server = hyper::Server::bind(&addr).serve(make_svc);
let graceful = server.with_graceful_shutdown(async { let graceful = server.with_graceful_shutdown(async {
@ -62,3 +66,4 @@ async fn test_tor_control_port() -> Result<()> {
let _ = tx.send(()); let _ = tx.send(());
Ok(()) Ok(())
} }
}