Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-06-08 15:12:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

Preemptively box cancel tx to avoid size difference in enum

Browse source
This commit is contained in:
Franck Royer 2021-02-08 14:18:33 +11:00
parent 69363e43a3
commit 39a46baa2c
No known key found for this signature in database
GPG key ID: A82ED75A8DFC50A4
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
swap/src/database/alice.rs
View file

@ -150,7 +150,7 @@ impl From<Alice> for AliceState {
AliceState::BtcCancelled { AliceState::BtcCancelled {
state3: Box::new(state), state3: Box::new(state),
tx_cancel, tx_cancel: Box::new(tx_cancel),
} }
} }
Alice::BtcPunishable(state3) => { Alice::BtcPunishable(state3) => {

2
swap/src/protocol/alice/state.rs
View file

@ -46,7 +46,7 @@ pub enum AliceState {
}, },
BtcRedeemed, BtcRedeemed,
BtcCancelled { BtcCancelled {
tx_cancel: TxCancel, tx_cancel: Box<TxCancel>,
state3: Box<State3>, state3: Box<State3>,
}, },
BtcRefunded { BtcRefunded {

5
swap/src/protocol/alice/swap.rs
View file

@ -305,7 +305,10 @@ async fn run_until_internal(
) )
.await?; .await?;
let state = AliceState::BtcCancelled { state3, tx_cancel }; let state = AliceState::BtcCancelled {
state3,
tx_cancel: Box::new(tx_cancel),
};
let db_state = (&state).into(); let db_state = (&state).into();
db.insert_latest_state(swap_id, database::Swap::Alice(db_state)) db.insert_latest_state(swap_id, database::Swap::Alice(db_state))
.await?; .await?;