From 795d0d779e22c0976c7052c3b92dc9edb87e9b9c Mon Sep 17 00:00:00 2001 From: andri lim Date: Mon, 19 Feb 2024 16:33:43 +0700 Subject: [PATCH] Bump json-rpc to 9c65df305390ab01a13788af5aea78cd62dceb2a (#2035) --- config.nims | 5 +---- tests/test_merge.nim | 5 ++--- vendor/nim-json-rpc | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/config.nims b/config.nims index 1c6f1d231..595b317bf 100644 --- a/config.nims +++ b/config.nims @@ -1,5 +1,5 @@ # Nimbus -# Copyright (c) 2018-2023 Status Research & Development GmbH +# Copyright (c) 2018-2024 Status Research & Development GmbH # Licensed under either of # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # http://www.apache.org/licenses/LICENSE-2.0) @@ -149,9 +149,6 @@ switch("warning", "ObservableStores:off") # Too many false positives for "Warning: method has lock level , but another method has 0 [LockLevel]" switch("warning", "LockLevel:off") -# nimbus-eth1 doesn't use 'news' nor ws client, only websock server. set the backend package to websock. -switch("define", "json_rpc_websocket_package:websock") - if defined(windows) and defined(i386): # avoid undefined reference to 'sqrx_mont_384x' when compiling in 32 bit mode # without actually using __BLST_PORTABLE__ or __BLST_NO_ASM__ diff --git a/tests/test_merge.nim b/tests/test_merge.nim index 5bbeabe22..cb365517c 100644 --- a/tests/test_merge.nim +++ b/tests/test_merge.nim @@ -75,7 +75,7 @@ proc runTest(steps: Steps) = com.initializeEmptyDb() var - rpcServer = newRpcSocketServer(["127.0.0.1:" & $conf.httpPort]) + rpcServer = newRpcSocketServer(["127.0.0.1:0"]) client = newRpcSocketClient() txPool = TxPoolRef.new(com, conf.engineSigner) sealingEngine = SealingEngineRef.new( @@ -89,7 +89,7 @@ proc runTest(steps: Steps) = sealingEngine.start() rpcServer.start() - waitFor client.connect("127.0.0.1", conf.httpPort) + waitFor client.connect(rpcServer.localAddress()[0]) suite "Engine API tests": for i, step in steps: @@ -104,7 +104,6 @@ proc runTest(steps: Steps) = else: doAssert(false, "unknown method: " & step.`method`) - waitFor client.close() waitFor sealingEngine.stop() rpcServer.stop() waitFor rpcServer.closeWait() diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc index 165e54133..9c65df305 160000 --- a/vendor/nim-json-rpc +++ b/vendor/nim-json-rpc @@ -1 +1 @@ -Subproject commit 165e54133d407726c98b38cea78138e8076da08d +Subproject commit 9c65df305390ab01a13788af5aea78cd62dceb2a