mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: return early

Browse Source
This commit is contained in:
chimp1984 2020-09-25 22:52:54 -05:00
parent 35b758431d
commit 0b81db5a60
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
1 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
core/src/main/java/bisq/core/trade/TradeManager.java
View File

@ -561,62 +561,66 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
// Publish delayed payout tx
///////////////////////////////////////////////////////////////////////////////////////////
//TODO move to protocol
public void publishDelayedPayoutTx(String tradeId,
ResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) {
getTradeById(tradeId).ifPresent(trade -> {
Transaction delayedPayoutTx = trade.getDelayedPayoutTx();
if (delayedPayoutTx != null) {
// We have spent the funds from the deposit tx with the delayedPayoutTx
btcWalletService.swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.MULTI_SIG);
// We might receive funds on AddressEntry.Context.TRADE_PAYOUT so we don't swap that
Transaction committedDelayedPayoutTx = WalletService.maybeAddSelfTxToWallet(delayedPayoutTx, btcWalletService.getWallet());
tradeWalletService.broadcastTx(committedDelayedPayoutTx, new TxBroadcaster.Callback() {
@Override
public void onSuccess(Transaction transaction) {
log.info("publishDelayedPayoutTx onSuccess " + transaction);
NodeAddress tradingPeerNodeAddress = trade.getTradingPeerNodeAddress();
PeerPublishedDelayedPayoutTxMessage msg = new PeerPublishedDelayedPayoutTxMessage(UUID.randomUUID().toString(),
tradeId,
tradingPeerNodeAddress);
p2PService.sendEncryptedMailboxMessage(
tradingPeerNodeAddress,
trade.getProcessModel().getTradingPeer().getPubKeyRing(),
msg,
new SendMailboxMessageListener() {
@Override
public void onArrived() {
resultHandler.handleResult();
log.info("SendMailboxMessageListener onArrived tradeId={} at peer {}",
tradeId, tradingPeerNodeAddress);
}
@Override
public void onStoredInMailbox() {
resultHandler.handleResult();
log.info("SendMailboxMessageListener onStoredInMailbox tradeId={} at peer {}",
tradeId, tradingPeerNodeAddress);
}
@Override
public void onFault(String errorMessage) {
log.error("SendMailboxMessageListener onFault tradeId={} at peer {}",
tradeId, tradingPeerNodeAddress);
errorMessageHandler.handleErrorMessage(errorMessage);
}
}
);
}
@Override
public void onFailure(TxBroadcastException exception) {
log.error("publishDelayedPayoutTx onFailure", exception);
errorMessageHandler.handleErrorMessage(exception.toString());
}
});
if (delayedPayoutTx == null) {
return;
}
// We have spent the funds from the deposit tx with the delayedPayoutTx
btcWalletService.swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.MULTI_SIG);
// We might receive funds on AddressEntry.Context.TRADE_PAYOUT so we don't swap that
Transaction committedDelayedPayoutTx = WalletService.maybeAddSelfTxToWallet(delayedPayoutTx, btcWalletService.getWallet());
tradeWalletService.broadcastTx(committedDelayedPayoutTx, new TxBroadcaster.Callback() {
@Override
public void onSuccess(Transaction transaction) {
log.info("publishDelayedPayoutTx onSuccess " + transaction);
NodeAddress tradingPeerNodeAddress = trade.getTradingPeerNodeAddress();
PeerPublishedDelayedPayoutTxMessage msg = new PeerPublishedDelayedPayoutTxMessage(UUID.randomUUID().toString(),
tradeId,
tradingPeerNodeAddress);
p2PService.sendEncryptedMailboxMessage(
tradingPeerNodeAddress,
trade.getProcessModel().getTradingPeer().getPubKeyRing(),
msg,
new SendMailboxMessageListener() {
@Override
public void onArrived() {
resultHandler.handleResult();
log.info("SendMailboxMessageListener onArrived tradeId={} at peer {}",
tradeId, tradingPeerNodeAddress);
}
@Override
public void onStoredInMailbox() {
resultHandler.handleResult();
log.info("SendMailboxMessageListener onStoredInMailbox tradeId={} at peer {}",
tradeId, tradingPeerNodeAddress);
}
@Override
public void onFault(String errorMessage) {
log.error("SendMailboxMessageListener onFault tradeId={} at peer {}",
tradeId, tradingPeerNodeAddress);
errorMessageHandler.handleErrorMessage(errorMessage);
}
}
);
}
@Override
public void onFailure(TxBroadcastException exception) {
log.error("publishDelayedPayoutTx onFailure", exception);
errorMessageHandler.handleErrorMessage(exception.toString());
}
});
});
}
@ -782,7 +786,6 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
return tradableList.stream().filter(e -> e.getId().equals(tradeId)).findFirst();
}
private void removeTrade(Trade trade) {
tradableList.remove(trade);
}