Archives/xmr-btc-swap
2
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-11-17 15:26:14 +00:00
Code Issues Projects Releases Wiki Activity

Use domain types in fn signature instead of messages

Browse Source 
This simplifies usage witin the swap module.
This commit is contained in:
Thomas Eizinger 2021-03-17 16:47:15 +11:00
parent 64b71d0b16
commit 575893fb51
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swap/src/protocol/alice/event_loop.rs
View File

@ -311,21 +311,23 @@ impl LatestRate for kraken::RateUpdateStream {
} }
impl EventLoopHandle { impl EventLoopHandle {
pub async fn recv_encrypted_signature(&mut self) -> Result<EncryptedSignature> { pub async fn recv_encrypted_signature(&mut self) -> Result<bitcoin::EncryptedSignature> {
let signature = self let signature = self
.recv_encrypted_signature .recv_encrypted_signature
.take() .take()
.context("Encrypted signature was already received")? .context("Encrypted signature was already received")?
.await?; .await?
.tx_redeem_encsig;
Ok(signature) Ok(signature)
} }
pub async fn send_transfer_proof(&mut self, msg: TransferProof) -> Result<()> {
pub async fn send_transfer_proof(&mut self, msg: monero::TransferProof) -> Result<()> {
if self if self
.send_transfer_proof .send_transfer_proof
.take() .take()
.context("Transfer proof was already sent")? .context("Transfer proof was already sent")?
.send(msg) .send(TransferProof { tx_lock_proof: msg })
.is_err() .is_err()
{ {
bail!("Failed to send transfer proof, receiver no longer listening?") bail!("Failed to send transfer proof, receiver no longer listening?")

7
swap/src/protocol/alice/steps.rs
View File

@ -3,7 +3,6 @@ use crate::bitcoin::{
}; };
use crate::protocol::alice; use crate::protocol::alice;
use crate::protocol::alice::event_loop::EventLoopHandle; use crate::protocol::alice::event_loop::EventLoopHandle;
use crate::protocol::alice::TransferProof;
use crate::{bitcoin, monero}; use crate::{bitcoin, monero};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
@ -27,9 +26,7 @@ pub async fn lock_xmr(
// Otherwise Alice might publish the lock tx twice! // Otherwise Alice might publish the lock tx twice!
event_loop_handle event_loop_handle
.send_transfer_proof(TransferProof { .send_transfer_proof(transfer_proof)
tx_lock_proof: transfer_proof,
})
.await?; .await?;
Ok(()) Ok(())
@ -45,7 +42,7 @@ pub async fn wait_for_bitcoin_encrypted_signature(
tracing::debug!("Message 3 received, returning it"); tracing::debug!("Message 3 received, returning it");
Ok(msg3.tx_redeem_encsig) Ok(msg3)
} }
pub async fn publish_cancel_transaction( pub async fn publish_cancel_transaction(