From 3b1961fb05d4f3d6f17b300b270d24eded687cea Mon Sep 17 00:00:00 2001 From: woodser Date: Thu, 23 May 2024 20:18:00 -0400 Subject: [PATCH] do not extend arbitrator timeout awaiting deposit txs --- .../main/java/haveno/core/trade/protocol/TradeProtocol.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java b/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java index e5cabc4c2e..a4cb01b417 100644 --- a/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java @@ -334,7 +334,7 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D public void handleSignContractRequest(SignContractRequest message, NodeAddress sender) { System.out.println(getClass().getSimpleName() + ".handleSignContractRequest() " + trade.getId()); - trade.addInitProgressStep(); + if (!trade.isArbitrator()) trade.addInitProgressStep(); // extend timeout unless arbitrator ThreadUtils.execute(() -> { synchronized (trade) { @@ -358,13 +358,11 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D ProcessSignContractRequest.class) .using(new TradeTaskRunner(trade, () -> { - startTimeout(); handleTaskRunnerSuccess(sender, message); }, errorMessage -> { handleTaskRunnerFault(sender, message, errorMessage); - })) - .withTimeout(TRADE_STEP_TIMEOUT_SECONDS)) // extend timeout + }))) .executeTasks(true); awaitTradeLatch(); } else {