From 520c2e1f32d0b6cb068a336cd86a2f6aa624c4b9 Mon Sep 17 00:00:00 2001 From: KirillPamPam Date: Wed, 18 Feb 2026 16:18:46 +0400 Subject: [PATCH 1/5] Test --- .../kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt index 9dff631a..7305ea58 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt @@ -52,6 +52,7 @@ class MonitoringSetup( } private fun isTcpPortAvailable(host: String, port: Int): Boolean { + try { ServerSocket().use { serverSocket -> // setReuseAddress(false) is required only on macOS, From ed389f3b2050c09305293dc42f50630866b2a1be Mon Sep 17 00:00:00 2001 From: KirillPamPam Date: Wed, 18 Feb 2026 16:21:41 +0400 Subject: [PATCH 2/5] Test --- .../kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt index 7305ea58..07360f37 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt @@ -52,7 +52,6 @@ class MonitoringSetup( } private fun isTcpPortAvailable(host: String, port: Int): Boolean { - try { ServerSocket().use { serverSocket -> // setReuseAddress(false) is required only on macOS, @@ -61,6 +60,7 @@ class MonitoringSetup( serverSocket.bind(InetSocketAddress(InetAddress.getByName(host), port), 1) return true } + } catch (ex: java.lang.Exception) { return false } From 59ddb26a4c90736a579ef5ff69b40c1028727c8f Mon Sep 17 00:00:00 2001 From: KirillPamPam Date: Wed, 18 Feb 2026 16:25:21 +0400 Subject: [PATCH 3/5] Test --- .../kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt index 07360f37..2839522d 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt @@ -57,10 +57,10 @@ class MonitoringSetup( // setReuseAddress(false) is required only on macOS, // otherwise the code will not work correctly on that platform serverSocket.reuseAddress = false + serverSocket.bind(InetSocketAddress(InetAddress.getByName(host), port), 1) return true } - } catch (ex: java.lang.Exception) { return false } From c8656e4ee07bbdc31bc677f1c9ba1af3782e779e Mon Sep 17 00:00:00 2001 From: KirillPamPam Date: Wed, 18 Feb 2026 16:29:05 +0400 Subject: [PATCH 4/5] Test --- .../io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt index 2839522d..acff2f92 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/MonitoringSetup.kt @@ -57,11 +57,10 @@ class MonitoringSetup( // setReuseAddress(false) is required only on macOS, // otherwise the code will not work correctly on that platform serverSocket.reuseAddress = false - serverSocket.bind(InetSocketAddress(InetAddress.getByName(host), port), 1) return true } - } catch (ex: java.lang.Exception) { + } catch (e: java.lang.Exception) { return false } } From c1d69f0c53cc5d4c0d305a0b07ccbafd832fc3ce Mon Sep 17 00:00:00 2001 From: KirillPamPam Date: Wed, 18 Feb 2026 16:48:07 +0400 Subject: [PATCH 5/5] Test --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 294d7f6a..e57a6e6b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -104,7 +104,7 @@ spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot- spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" } -testcontainers = "org.testcontainers:testcontainers:1.21.3" +testcontainers = "org.testcontainers:testcontainers:2.0.3" testcontainers-ganache = "io.github.ganchix:testcontainers-java-module-ganache:0.0.4" assertj = "org.assertj:assertj-core:3.23.1"