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

Merge #124

Browse Source 
124: Cleanup unused config param that was accidentally introduced r=da-kami a=da-kami



Co-authored-by: Daniel Karzel <daniel@comit.network>
This commit is contained in:
bors[bot] 2021-01-07 23:04:31 +00:00 committed by GitHub
commit a0d859147a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
swap/src/bob/swap.rs
View File

@ -8,7 +8,6 @@ use tracing::info;
use uuid::Uuid;
use xmr_btc::{
bob::{self, State2},
config::Config,
ExpiredTimelocks,
};
@ -60,7 +59,6 @@ pub async fn swap<R>(
monero_wallet: Arc<crate::monero::Wallet>,
rng: R,
swap_id: Uuid,
config: Config,
) -> Result<BobState>
where
R: RngCore + CryptoRng + Send,
@ -74,7 +72,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -113,7 +110,6 @@ pub async fn run_until<R>(
monero_wallet: Arc<crate::monero::Wallet>,
mut rng: R,
swap_id: Uuid,
config: Config,
) -> Result<BobState>
where
R: RngCore + CryptoRng + Send,
@ -148,7 +144,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -171,7 +166,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -226,7 +220,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -269,7 +262,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -306,7 +298,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -327,7 +318,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -353,7 +343,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}
@ -382,7 +371,6 @@ where
monero_wallet,
rng,
swap_id,
config,
)
.await
}

4
swap/src/main.rs
View File

@ -160,7 +160,6 @@ async fn main() -> Result<()> {
db,
alice_peer_id,
alice_addr,
config,
)
.await?;
}
@ -236,7 +235,6 @@ async fn main() -> Result<()> {
db,
alice_peer_id,
alice_addr,
config,
)
.await?;
}
@ -313,7 +311,6 @@ async fn bob_swap(
db: Database,
alice_peer_id: PeerId,
alice_addr: Multiaddr,
config: Config,
) -> Result<BobState> {
let bob_behaviour = bob::Behaviour::default();
let bob_transport = build(bob_behaviour.identity())?;
@ -329,7 +326,6 @@ async fn bob_swap(
monero_wallet.clone(),
OsRng,
swap_id,
config,
);
tokio::spawn(event_loop.run());

1
swap/tests/happy_path.rs
View File

@ -98,7 +98,6 @@ async fn happy_path() {
bob_xmr_wallet.clone(),
OsRng,
Uuid::new_v4(),
config,
)
.boxed();

1
swap/tests/happy_path_restart_alice.rs
View File

@ -83,7 +83,6 @@ async fn given_alice_restarts_after_encsig_is_learned_resume_swap() {
bob_xmr_wallet.clone(),
OsRng,
Uuid::new_v4(),
config,
);
let alice_db_datadir = tempdir().unwrap();

2
swap/tests/happy_path_restart_bob_after_comm.rs
View File

@ -106,7 +106,6 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
bob_xmr_wallet.clone(),
OsRng,
bob_swap_id,
config,
)
.await
.unwrap();
@ -135,7 +134,6 @@ async fn given_bob_restarts_after_encsig_is_sent_resume_swap() {
bob_xmr_wallet,
OsRng,
bob_swap_id,
config,
)
.await
.unwrap();

2
swap/tests/happy_path_restart_bob_before_comm.rs
View File

@ -95,7 +95,6 @@ async fn given_bob_restarts_after_xmr_is_locked_resume_swap() {
bob_xmr_wallet.clone(),
OsRng,
bob_swap_id,
Config::regtest(),
)
};
@ -121,7 +120,6 @@ async fn given_bob_restarts_after_xmr_is_locked_resume_swap() {
bob_xmr_wallet.clone(),
OsRng,
bob_swap_id,
Config::regtest(),
);
let bob_final_state = select! {

1
swap/tests/punish.rs
View File

@ -84,7 +84,6 @@ async fn alice_punishes_if_bob_never_acts_after_fund() {
bob_xmr_wallet.clone(),
OsRng,
Uuid::new_v4(),
config,
)
.boxed();

1
swap/tests/refund_restart_alice.rs
View File

@ -81,7 +81,6 @@ async fn given_alice_restarts_after_xmr_is_locked_abort_swap() {
bob_xmr_wallet.clone(),
OsRng,
Uuid::new_v4(),
Config::regtest(),
);
let alice_swap_id = Uuid::new_v4();