You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
log.warn("Resetting state of {} {} from {} to {} because payout is not published", getClass().getSimpleName(), getId(), getState(), Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
853
+
// reset buyer's payment sent state if applicable
854
+
if (thisinstanceofBuyerTrade && (getState().ordinal() ==Trade.State.BUYER_CONFIRMED_PAYMENT_SENT.ordinal() ||getState() == State.BUYER_SEND_FAILED_PAYMENT_SENT_MSG)) {
855
+
log.warn("Resetting state of {} {} from {} to {} because sending PaymentSentMessage failed", getClass().getSimpleName(), getId(), getState(), Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
// reset seller's payment received state unless stored in mailbox
860
-
if (thisinstanceofSellerTrade && getState().ordinal() >=Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT.ordinal() &&getState().ordinal() != Trade.State.SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG.ordinal()) {
861
-
log.warn("Resetting state of {} {} from {} to {} because payout is not published", getClass().getSimpleName(), getId(), getState(), Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
859
+
// reset seller's payment received state if applicable
860
+
if (thisinstanceofSellerTrade && (getState().ordinal() ==Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT.ordinal() ||getState() == State.SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG)) {
861
+
log.warn("Resetting state of {} {} from {} to {} because sending PaymentReceivedMessage failed", getClass().getSimpleName(), getId(), getState(), Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
862
862
resetToPaymentSentState();
863
863
}
864
864
}
@@ -2405,6 +2405,10 @@ public boolean isPaymentSent() {
0 commit comments