Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-12-25 15:29:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove timeout confirming payment sent/received & revert state on error

Browse Source
This commit is contained in:
woodser 2024-04-19 14:30:55 -04:00
parent 0ead6d8f83
commit 5c0d9a1ae5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
View File

@ -140,9 +140,10 @@ public class BuyerProtocol extends DisputeProtocol {
handleTaskRunnerSuccess(event); handleTaskRunnerSuccess(event);
}, },
(errorMessage) -> { (errorMessage) -> {
log.warn("Error confirming payment sent, reverting state to {}, error={}", Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN, errorMessage);
trade.setState(Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
handleTaskRunnerFault(event, errorMessage); handleTaskRunnerFault(event, errorMessage);
})) })))
.withTimeout(TradeProtocol.TRADE_TIMEOUT_SECONDS))
.run(() -> trade.advanceState(Trade.State.BUYER_CONFIRMED_PAYMENT_SENT)) .run(() -> trade.advanceState(Trade.State.BUYER_CONFIRMED_PAYMENT_SENT))
.executeTasks(true); .executeTasks(true);
} catch (Exception e) { } catch (Exception e) {

5
core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
View File

@ -136,9 +136,10 @@ public class SellerProtocol extends DisputeProtocol {
handleTaskRunnerSuccess(event); handleTaskRunnerSuccess(event);
resultHandler.handleResult(); resultHandler.handleResult();
}, (errorMessage) -> { }, (errorMessage) -> {
log.warn("Error confirming payment received, reverting state to {}, error={}", Trade.State.BUYER_SENT_PAYMENT_SENT_MSG, errorMessage);
trade.setState(Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
handleTaskRunnerFault(event, errorMessage); handleTaskRunnerFault(event, errorMessage);
})) })))
.withTimeout(TradeProtocol.TRADE_TIMEOUT_SECONDS))
.run(() -> trade.advanceState(Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT)) .run(() -> trade.advanceState(Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT))
.executeTasks(true); .executeTasks(true);
} catch (Exception e) { } catch (Exception e) {