Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-05-02 14:56:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove generics from Database

Browse source
This commit is contained in:
Lucas Soriano del Pino 2020-11-03 15:26:47 +11:00 • committed by rishflab
parent 02075c2a1d
commit f9cfc2abe3
6 changed files with 103 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

43
swap/src/alice.rs
View file

@ -45,7 +45,7 @@ use xmr_btc::{
pub async fn swap(
bitcoin_wallet: Arc<bitcoin::Wallet>,
monero_wallet: Arc<monero::Wallet>,
db: Database<storage::Alice>,
db: Database,
listen: Multiaddr,
transport: SwapTransport,
behaviour: Alice,
@ -177,7 +177,7 @@ pub async fn swap(
};
let swap_id = Uuid::new_v4();
db.insert_latest_state(swap_id, &storage::Alice::Handshaken(state3.clone()))
db.insert_latest_state(swap_id, storage::Alice::Handshaken(state3.clone()).into())
.await?;
info!("Handshake complete, we now have State3 for Alice.");
@ -205,14 +205,14 @@ pub async fn swap(
public_spend_key,
public_view_key,
}) => {
db.insert_latest_state(swap_id, &storage::Alice::BtcLocked(state3.clone()))
db.insert_latest_state(swap_id, storage::Alice::BtcLocked(state3.clone()).into())
.await?;
let (transfer_proof, _) = monero_wallet
.transfer(public_spend_key, public_view_key, amount)
.await?;
db.insert_latest_state(swap_id, &storage::Alice::XmrLocked(state3.clone()))
db.insert_latest_state(swap_id, storage::Alice::XmrLocked(state3.clone()).into())
.await?;
let mut guard = network.as_ref().lock().await;
@ -221,10 +221,14 @@ pub async fn swap(
}
GeneratorState::Yielded(Action::RedeemBtc(tx)) => {
db.insert_latest_state(swap_id, &storage::Alice::BtcRedeemable {
state: state3.clone(),
redeem_tx: tx.clone(),
})
db.insert_latest_state(
swap_id,
storage::Alice::BtcRedeemable {
state: state3.clone(),
redeem_tx: tx.clone(),
}
.into(),
)
.await?;
let _ = bitcoin_wallet.broadcast_signed_transaction(tx).await?;
@ -233,8 +237,11 @@ pub async fn swap(
let _ = bitcoin_wallet.broadcast_signed_transaction(tx).await?;
}
GeneratorState::Yielded(Action::PunishBtc(tx)) => {
db.insert_latest_state(swap_id, &storage::Alice::BtcPunishable(state3.clone()))
.await?;
db.insert_latest_state(
swap_id,
storage::Alice::BtcPunishable(state3.clone()).into(),
)
.await?;
let _ = bitcoin_wallet.broadcast_signed_transaction(tx).await?;
}
@ -242,11 +249,15 @@ pub async fn swap(
spend_key,
view_key,
}) => {
db.insert_latest_state(swap_id, &storage::Alice::BtcRefunded {
state: state3.clone(),
spend_key,
view_key,
})
db.insert_latest_state(
swap_id,
storage::Alice::BtcRefunded {
state: state3.clone(),
spend_key,
view_key,
}
.into(),
)
.await?;
monero_wallet
@ -254,7 +265,7 @@ pub async fn swap(
.await?;
}
GeneratorState::Complete(()) => {
db.insert_latest_state(swap_id, &storage::Alice::SwapComplete)
db.insert_latest_state(swap_id, storage::Alice::SwapComplete.into())
.await?;
return Ok(());