Cleanup unused config param that was accidentally introduced

This commit is contained in:
Daniel Karzel 2021-01-07 12:23:29 +11:00
parent 903469f62a
commit 487b880371
8 changed files with 0 additions and 24 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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