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

Shorten function name

Browse Source 
This struct is a wallet. The only thing it can meaningfully broadcast
are transactions. The fact that they have to be signed for that is
implied. You cannot broadcast unsigned transactions.
This commit is contained in:
Thomas Eizinger 2021-03-02 12:25:47 +11:00
parent 45cff81ea5
commit 3a503bf95f
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swap/src/bitcoin/wallet.rs
View File

@ -147,7 +147,7 @@ impl Wallet {
self.inner.lock().await.network()
}
pub async fn broadcast_signed_transaction(&self, transaction: Transaction) -> Result<Txid> {
pub async fn broadcast(&self, transaction: Transaction) -> Result<Txid> {
let txid = transaction.txid();
self.inner

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

@ -130,9 +130,7 @@ pub async fn publish_bitcoin_redeem_transaction(
bitcoin_wallet: Arc<bitcoin::Wallet>,
) -> Result<::bitcoin::Txid> {
info!("Attempting to publish bitcoin redeem txn");
let txid = bitcoin_wallet
.broadcast_signed_transaction(redeem_tx)
.await?;
let txid = bitcoin_wallet.broadcast(redeem_tx).await?;
Ok(txid)
}
@ -172,9 +170,7 @@ pub async fn publish_cancel_transaction(
.expect("sig_{a,b} to be valid signatures for tx_cancel");
// TODO(Franck): Error handling is delicate, why can't we broadcast?
bitcoin_wallet
.broadcast_signed_transaction(tx_cancel)
.await?;
bitcoin_wallet.broadcast(tx_cancel).await?;
// TODO(Franck): Wait until transaction is mined and returned mined
// block height
@ -258,9 +254,7 @@ pub async fn publish_bitcoin_punish_transaction(
bitcoin_wallet: Arc<bitcoin::Wallet>,
execution_params: ExecutionParams,
) -> Result<bitcoin::Txid> {
let txid = bitcoin_wallet
.broadcast_signed_transaction(punish_tx)
.await?;
let txid = bitcoin_wallet.broadcast(punish_tx).await?;
bitcoin_wallet
.wait_for_transaction_finality(txid, execution_params)

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

@ -272,9 +272,7 @@ impl State2 {
let signed_tx_lock = bitcoin_wallet.sign_tx_lock(self.tx_lock.clone()).await?;
tracing::debug!("locking BTC in transaction {}", self.tx_lock.txid());
let _ = bitcoin_wallet
.broadcast_signed_transaction(signed_tx_lock)
.await?;
let _ = bitcoin_wallet.broadcast(signed_tx_lock).await?;
Ok(State3 {
A: self.A,
@ -477,9 +475,7 @@ impl State4 {
tx_cancel",
);
let tx_id = bitcoin_wallet
.broadcast_signed_transaction(tx_cancel)
.await?;
let tx_id = bitcoin_wallet.broadcast(tx_cancel).await?;
Ok(tx_id)
}
@ -548,9 +544,7 @@ impl State4 {
let signed_tx_refund =
tx_refund.add_signatures((self.A, sig_a), (self.b.public(), sig_b))?;
let txid = bitcoin_wallet
.broadcast_signed_transaction(signed_tx_refund)
.await?;
let txid = bitcoin_wallet.broadcast(signed_tx_refund).await?;
bitcoin_wallet
.wait_for_transaction_finality(txid, execution_params)