From 6f803560cd2e609d1441055041b62293b99520de Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Thu, 5 Jan 2023 10:18:42 -0500 Subject: [PATCH] Improve logs Signed-off-by: HenrikJannsen --- .../tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java | 10 +++++++--- .../buyer/BuyerVerifiesPreparedDelayedPayoutTx.java | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java index ba05dacec9..969edf5c5b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java @@ -32,7 +32,6 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @Slf4j @@ -74,8 +73,13 @@ public class BuyerVerifiesFinalDelayedPayoutTx extends TradeTask { depositTx, delayedPayoutTxReceivers, lockTime); - checkArgument(buyersDelayedPayoutTx.getTxId().equals(finalDelayedPayoutTx.getTxId()), - "TxIds of buyersDelayedPayoutTx and finalDelayedPayoutTx must be the same"); + + if (!buyersDelayedPayoutTx.getTxId().equals(finalDelayedPayoutTx.getTxId())) { + String errorMsg = "TxIds of buyersDelayedPayoutTx and finalDelayedPayoutTx must be the same."; + log.error("{} \nbuyersDelayedPayoutTx={}, \nfinalDelayedPayoutTx={}", + errorMsg, buyersDelayedPayoutTx, finalDelayedPayoutTx); + throw new IllegalArgumentException(errorMsg); + } } complete(); diff --git a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesPreparedDelayedPayoutTx.java b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesPreparedDelayedPayoutTx.java index 9f7e9c0d5f..a1563e0642 100644 --- a/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesPreparedDelayedPayoutTx.java +++ b/core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/buyer/BuyerVerifiesPreparedDelayedPayoutTx.java @@ -32,7 +32,6 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @Slf4j @@ -66,8 +65,12 @@ public class BuyerVerifiesPreparedDelayedPayoutTx extends TradeTask { preparedDepositTx, delayedPayoutTxReceivers, lockTime); - checkArgument(buyersPreparedDelayedPayoutTx.getTxId().equals(sellersPreparedDelayedPayoutTx.getTxId()), - "TxIds of buyersPreparedDelayedPayoutTx and sellersPreparedDelayedPayoutTx must be the same"); + if (!buyersPreparedDelayedPayoutTx.getTxId().equals(sellersPreparedDelayedPayoutTx.getTxId())) { + String errorMsg = "TxIds of buyersPreparedDelayedPayoutTx and sellersPreparedDelayedPayoutTx must be the same."; + log.error("{} \nbuyersPreparedDelayedPayoutTx={}, \nsellersPreparedDelayedPayoutTx={}", + errorMsg, buyersPreparedDelayedPayoutTx, sellersPreparedDelayedPayoutTx); + throw new IllegalArgumentException(errorMsg); + } } // If the deposit tx is non-malleable, we already know its final ID, so should check that now