Merge pull request #2689 from HenrikJannsen/reduce-userNodeSocketTimeout

Reduce user node socket timeout
bisq-network · Aug 25, 2024 · a99624c · a99624c
2 parents b3c2b65 + 37ba30f
commit a99624c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/apps/desktop/desktop-app/src/main/resources/desktop.conf b/apps/desktop/desktop-app/src/main/resources/desktop.conf
@@ -180,7 +180,7 @@ application {
         configByTransportType {
             clear { 
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 devModeDelayInMs = 300
                 sendMessageThrottleTime = 200
                 receiveMessageThrottleTime = 200
@@ -189,7 +189,7 @@ application {
                 bootstrapTimeout = 240
                 hsUploadTimeout = 120
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 testNetwork = false
                 directoryAuthorities = []
                 torrcOverrides = {}
@@ -198,7 +198,7 @@ application {
             }
             i2p {
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 i2cpHost = "127.0.0.1"
                 i2cpPort = 7654
                 inboundKBytesPerSecond = 1024

diff --git a/...java/bisq/desktop/main/content/bisq_easy/take_offer/review/TakeOfferReviewController.java b/...java/bisq/desktop/main/content/bisq_easy/take_offer/review/TakeOfferReviewController.java
@@ -239,7 +239,7 @@ private void doTakeOffer(BisqEasyOffer bisqEasyOffer, UserIdentity takerIdentity
                     closeAndNavigateToHandler.accept(NavigationTarget.BISQ_EASY);
                     throw new RuntimeException("Take offer message sending did not succeed after 2 minutes.");
                 })
-                .after(2, TimeUnit.MINUTES);
+                .after(150, TimeUnit.SECONDS); // We have 120 seconds socket timeout, so we should never get triggered here, as the message will be sent as mailbox message
         bisqEasyOpenTradeChannelService.sendTakeOfferMessage(tradeId, bisqEasyOffer, contract.getMediator())
                 .thenAccept(result -> UIThread.run(() -> {
                     timeoutScheduler.stop();

diff --git a/.../bisq/desktop/main/content/bisq_easy/trade_wizard/review/TradeWizardReviewController.java b/.../bisq/desktop/main/content/bisq_easy/trade_wizard/review/TradeWizardReviewController.java
@@ -476,7 +476,7 @@ private void doTakeOffer(BisqEasyOffer bisqEasyOffer, UserIdentity takerIdentity
                     closeAndNavigateToHandler.accept(NavigationTarget.BISQ_EASY);
                     throw new RuntimeException("Take offer message sending did not succeed after 2 minutes.");
                 })
-                .after(2, TimeUnit.MINUTES);
+                .after(150, TimeUnit.SECONDS); // We have 120 seconds socket timeout, so we should never get triggered here, as the message will be sent as mailbox message
 
         bisqEasyOpenTradeChannelService.sendTakeOfferMessage(tradeId, bisqEasyOffer, contract.getMediator())
                 .thenAccept(result -> UIThread.run(() -> {

diff --git a/apps/oracle-node-app/src/main/resources/oracle_node.conf b/apps/oracle-node-app/src/main/resources/oracle_node.conf
@@ -183,7 +183,7 @@ application {
         configByTransportType {
             clear { 
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 devModeDelayInMs = 300
                 sendMessageThrottleTime = 200
                 receiveMessageThrottleTime = 200
@@ -192,7 +192,7 @@ application {
                 bootstrapTimeout = 240
                 hsUploadTimeout = 120
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 testNetwork = false
                 directoryAuthorities = []
                 torrcOverrides = {}
@@ -201,7 +201,7 @@ application {
             }
             i2p {
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 i2cpHost = "127.0.0.1"
                 i2cpPort = 7654
                 inboundKBytesPerSecond = 1024

diff --git a/apps/rest-api-app/src/main/resources/rest_api.conf b/apps/rest-api-app/src/main/resources/rest_api.conf
@@ -179,7 +179,7 @@ application {
         configByTransportType {
             clear {
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 devModeDelayInMs = 300
                 sendMessageThrottleTime = 200
                 receiveMessageThrottleTime = 200
@@ -188,7 +188,7 @@ application {
                 bootstrapTimeout = 240
                 hsUploadTimeout = 120
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 testNetwork = false
                 directoryAuthorities = []
                 torrcOverrides = {}
@@ -197,7 +197,7 @@ application {
             }
             i2p {
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 i2cpHost = "127.0.0.1"
                 i2cpPort = 7654
                 inboundKBytesPerSecond = 1024

diff --git a/apps/seed-node-app/src/main/resources/seed_node.conf b/apps/seed-node-app/src/main/resources/seed_node.conf
@@ -167,7 +167,7 @@ application {
         configByTransportType {
             clear {
                 defaultNodeSocketTimeout = 120
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 defaultNodePort = 8000
                 devModeDelayInMs = 300
                 sendMessageThrottleTime = 200
@@ -177,7 +177,7 @@ application {
                 bootstrapTimeout = 240
                 hsUploadTimeout = 120
                 defaultNodeSocketTimeout = 300
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 defaultNodePort = 1000
                 testNetwork = false
                 directoryAuthorities = []
@@ -187,7 +187,7 @@ application {
             }
             i2p {
                 defaultNodeSocketTimeout = 300
-                userNodeSocketTimeout = 600
+                userNodeSocketTimeout = 120
                 defaultNodePort = 2000
                 i2cpHost = "127.0.0.1"
                 i2cpPort = 7654