From e8bc5c46e9e561e4da05bf406e6c5df943b00baf Mon Sep 17 00:00:00 2001 From: Arnaud Date: Mon, 13 Apr 2026 10:07:38 +0400 Subject: [PATCH] chore: cleanup dependencies (#1415) Signed-off-by: Arnaud Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .gitmodules | 14 ------------- Makefile | 2 +- library/alloc.nim | 21 ------------------- storage/conf.nim | 2 +- storage/nat.nim | 1 - storage/node.nim | 1 - storage/rest/api.nim | 1 - storage/storage.nim | 3 --- tests/examples.nim | 1 - tests/helpers.nim | 1 - tests/integration/5_minutes/testrestapi.nim | 2 -- tests/integration/multinodes.nim | 3 --- tests/integration/nodeprocess.nim | 1 - tests/integration/utils.nim | 6 ++++-- .../blockexchange/discovery/testdiscovery.nim | 2 -- .../blockexchange/engine/testblockexc.nim | 1 - .../blockexchange/engine/testengine.nim | 3 --- tests/storage/merkletree/teststoragetree.nim | 1 - tests/storage/node/helpers.nim | 1 - tests/storage/node/testnode.nim | 3 --- tests/storage/slots/helpers.nim | 2 -- tests/storage/stores/testkeyutils.nim | 4 ---- tests/storage/testmanifest.nim | 2 -- tests/storage/testnat.nim | 3 +-- vendor/nim-eth | 1 - vendor/nim-ethers | 1 - vendor/nim-json-rpc | 1 - vendor/nim-nitro | 1 - 28 files changed, 7 insertions(+), 78 deletions(-) delete mode 160000 vendor/nim-eth delete mode 160000 vendor/nim-ethers delete mode 160000 vendor/nim-json-rpc delete mode 160000 vendor/nim-nitro diff --git a/.gitmodules b/.gitmodules index 240f4b5c..e6214d80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,11 +33,6 @@ url = https://github.com/status-im/nim-stew.git ignore = untracked branch = master -[submodule "vendor/nim-nitro"] - path = vendor/nim-nitro - url = https://github.com/status-im/nim-nitro.git - ignore = untracked - branch = main [submodule "vendor/questionable"] path = vendor/questionable url = https://github.com/status-im/questionable.git @@ -131,15 +126,9 @@ [submodule "vendor/nim-contract-abi"] path = vendor/nim-contract-abi url = https://github.com/status-im/nim-contract-abi -[submodule "vendor/nim-json-rpc"] - path = vendor/nim-json-rpc - url = https://github.com/status-im/nim-json-rpc [submodule "vendor/nim-zlib"] path = vendor/nim-zlib url = https://github.com/status-im/nim-zlib -[submodule "vendor/nim-ethers"] - path = vendor/nim-ethers - url = https://github.com/status-im/nim-ethers [submodule "vendor/lrucache.nim"] path = vendor/lrucache.nim url = https://github.com/status-im/lrucache.nim @@ -167,9 +156,6 @@ [submodule "vendor/nim-sqlite3-abi"] path = vendor/nim-sqlite3-abi url = https://github.com/arnetheduck/nim-sqlite3-abi.git -[submodule "vendor/nim-eth"] - path = vendor/nim-eth - url = https://github.com/status-im/nim-eth [submodule "vendor/nim-protobuf-serialization"] path = vendor/nim-protobuf-serialization url = https://github.com/status-im/nim-protobuf-serialization diff --git a/Makefile b/Makefile index 2046e2bf..0f9d9a55 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ test: | build deps # Builds and runs the integration tests testIntegration: | build deps echo -e $(BUILD_MSG) "build/$@" && \ - $(ENV_SCRIPT) nim testIntegration $(TEST_PARAMS) $(NIM_PARAMS) --define:ws_resubscribe=240 build.nims + $(ENV_SCRIPT) nim testIntegration $(TEST_PARAMS) $(NIM_PARAMS) build.nims # Builds a C example that uses the libstorage C library and runs it testLibstorage: | build deps diff --git a/library/alloc.nim b/library/alloc.nim index 1a6f118b..f252d657 100644 --- a/library/alloc.nim +++ b/library/alloc.nim @@ -1,6 +1,3 @@ -## Can be shared safely between threads -type SharedSeq*[T] = tuple[data: ptr UncheckedArray[T], len: int] - proc alloc*(str: cstring): cstring = # Byte allocation from the given address. # There should be the corresponding manual deallocation with deallocShared ! @@ -22,21 +19,3 @@ proc alloc*(str: string): cstring = ret[i] = s[i] ret[str.len] = '\0' return ret - -proc allocSharedSeq*[T](s: seq[T]): SharedSeq[T] = - let data = allocShared(sizeof(T) * s.len) - if s.len != 0: - copyMem(data, unsafeAddr s[0], s.len) - return (cast[ptr UncheckedArray[T]](data), s.len) - -proc deallocSharedSeq*[T](s: var SharedSeq[T]) = - deallocShared(s.data) - s.len = 0 - -proc toSeq*[T](s: SharedSeq[T]): seq[T] = - ## Creates a seq[T] from a SharedSeq[T]. No explicit dealloc is required - ## as req[T] is a GC managed type. - var ret = newSeq[T]() - for i in 0 ..< s.len: - ret.add(s.data[i]) - return ret diff --git a/storage/conf.nim b/storage/conf.nim index 062eec0b..f83d0bd7 100644 --- a/storage/conf.nim +++ b/storage/conf.nim @@ -11,7 +11,7 @@ import std/os -{.push warning[UnusedImport]: on.} +{.push warning[UnusedImport]: off.} import std/terminal # Is not used in tests {.pop.} diff --git a/storage/nat.nim b/storage/nat.nim index 0a711df5..eaee7c8b 100644 --- a/storage/nat.nim +++ b/storage/nat.nim @@ -10,7 +10,6 @@ import std/[options, os, strutils, times, net, atomics], - stew/[objects], nat_traversal/[miniupnpc, natpmp], json_serialization/std/net, results diff --git a/storage/node.nim b/storage/node.nim index ac04cb58..f75656f2 100644 --- a/storage/node.nim +++ b/storage/node.nim @@ -12,7 +12,6 @@ import std/options import std/sequtils import std/strformat -import std/sugar import times import pkg/taskpools diff --git a/storage/rest/api.nim b/storage/rest/api.nim index dbc308e1..7b686234 100644 --- a/storage/rest/api.nim +++ b/storage/rest/api.nim @@ -19,7 +19,6 @@ import pkg/chronos import pkg/presto except toJson import pkg/metrics except toJson import pkg/stew/base10 -import pkg/stew/byteutils import pkg/confutils import pkg/libp2p diff --git a/storage/storage.nim b/storage/storage.nim index 16a2cb20..f7766fb3 100644 --- a/storage/storage.nim +++ b/storage/storage.nim @@ -7,8 +7,6 @@ ## This file may not be copied, modified, or distributed except according to ## those terms. -import std/sequtils -import std/strutils import std/os import std/tables import std/cpuinfo @@ -32,7 +30,6 @@ import ./stores import ./blockexchange import ./utils/fileutils import ./discovery -import ./systemclock import ./utils/addrutils import ./namespaces import ./storagetypes diff --git a/tests/examples.nim b/tests/examples.nim index 710bbcfb..eb269084 100644 --- a/tests/examples.nim +++ b/tests/examples.nim @@ -8,7 +8,6 @@ import pkg/storage/stores import pkg/storage/units import pkg/chronos -import pkg/stew/byteutils import pkg/stint import ./storage/helpers/randomchunker diff --git a/tests/helpers.nim b/tests/helpers.nim index e938015f..7a07bc30 100644 --- a/tests/helpers.nim +++ b/tests/helpers.nim @@ -1,7 +1,6 @@ import helpers/multisetup import helpers/trackers import helpers/templeveldb -import std/times import std/sequtils, chronos import ./asynctest diff --git a/tests/integration/5_minutes/testrestapi.nim b/tests/integration/5_minutes/testrestapi.nim index fde9a8ce..17ce1e3e 100644 --- a/tests/integration/5_minutes/testrestapi.nim +++ b/tests/integration/5_minutes/testrestapi.nim @@ -1,7 +1,5 @@ -import std/importutils import std/net import std/sequtils -import std/strformat from pkg/libp2p import `==`, `$`, Cid import pkg/storage/units import pkg/storage/manifest diff --git a/tests/integration/multinodes.nim b/tests/integration/multinodes.nim index 5ee7d202..9d4153bd 100644 --- a/tests/integration/multinodes.nim +++ b/tests/integration/multinodes.nim @@ -1,6 +1,5 @@ import std/httpclient import std/os -import std/sequtils import std/strutils import std/sugar import std/times @@ -33,7 +32,6 @@ type MultiNodeSuiteError = object of CatchableError SuiteTimeoutError = object of MultiNodeSuiteError -const HardhatPort {.intdefine.}: int = 8545 const StorageApiPort {.intdefine.}: int = 8080 const StorageDiscPort {.intdefine.}: int = 8090 const TestId {.strdefine.}: string = "TestId" @@ -76,7 +74,6 @@ template multinodesuite*(suiteName: string, body: untyped) = var currentTestName = "" var nodeConfigs: NodeConfigs var snapshot: JsonNode - var lastUsedHardhatPort = HardhatPort var lastUsedStorageApiPort = StorageApiPort var lastUsedStorageDiscPort = StorageDiscPort var storagePortLock: AsyncLock diff --git a/tests/integration/nodeprocess.nim b/tests/integration/nodeprocess.nim index 907eeba5..081323be 100644 --- a/tests/integration/nodeprocess.nim +++ b/tests/integration/nodeprocess.nim @@ -5,7 +5,6 @@ import pkg/chronicles import pkg/chronos/asyncproc import pkg/libp2p import std/os -import std/strformat import std/strutils import storage/conf import storage/utils/exceptions diff --git a/tests/integration/utils.nim b/tests/integration/utils.nim index 7d48d5d5..37042c00 100644 --- a/tests/integration/utils.nim +++ b/tests/integration/utils.nim @@ -1,9 +1,11 @@ import std/os -import std/strformat import pkg/chronos -import pkg/chronos/asyncproc import pkg/storage/logutils +when defined(windows): + import std/strformat + import pkg/chronos/asyncproc + {.push raises: [].} proc nextFreePort*(startPort: int): Future[int] {.async: (raises: [CancelledError]).} = diff --git a/tests/storage/blockexchange/discovery/testdiscovery.nim b/tests/storage/blockexchange/discovery/testdiscovery.nim index ab237542..2209a43c 100644 --- a/tests/storage/blockexchange/discovery/testdiscovery.nim +++ b/tests/storage/blockexchange/discovery/testdiscovery.nim @@ -4,8 +4,6 @@ import std/tables import pkg/chronos -import pkg/libp2p/errors - import pkg/storage/rng import pkg/storage/stores import pkg/storage/blockexchange diff --git a/tests/storage/blockexchange/engine/testblockexc.nim b/tests/storage/blockexchange/engine/testblockexc.nim index 515236bf..8432fc15 100644 --- a/tests/storage/blockexchange/engine/testblockexc.nim +++ b/tests/storage/blockexchange/engine/testblockexc.nim @@ -1,6 +1,5 @@ import std/sequtils import std/algorithm -import std/importutils import pkg/chronos import pkg/stew/byteutils diff --git a/tests/storage/blockexchange/engine/testengine.nim b/tests/storage/blockexchange/engine/testengine.nim index b04fb29d..09e4d545 100644 --- a/tests/storage/blockexchange/engine/testengine.nim +++ b/tests/storage/blockexchange/engine/testengine.nim @@ -1,10 +1,7 @@ import std/sequtils -import std/random import std/algorithm -import pkg/stew/byteutils import pkg/chronos -import pkg/libp2p/errors import pkg/libp2p/routing_record import pkg/codexdht/discv5/protocol as discv5 diff --git a/tests/storage/merkletree/teststoragetree.nim b/tests/storage/merkletree/teststoragetree.nim index ae9e035e..fedf85fa 100644 --- a/tests/storage/merkletree/teststoragetree.nim +++ b/tests/storage/merkletree/teststoragetree.nim @@ -1,5 +1,4 @@ import std/sequtils -import std/times import pkg/questionable/results import pkg/stew/byteutils diff --git a/tests/storage/node/helpers.nim b/tests/storage/node/helpers.nim index 00a87c97..9c75f905 100644 --- a/tests/storage/node/helpers.nim +++ b/tests/storage/node/helpers.nim @@ -6,7 +6,6 @@ import pkg/chronos import pkg/storage/storagetypes import pkg/storage/chunker import pkg/storage/stores -import pkg/taskpools import ../../asynctest diff --git a/tests/storage/node/testnode.nim b/tests/storage/node/testnode.nim index 389b4f8f..96d4b28a 100644 --- a/tests/storage/node/testnode.nim +++ b/tests/storage/node/testnode.nim @@ -7,9 +7,7 @@ import pkg/chronos import pkg/stew/byteutils import pkg/datastore import pkg/datastore/typedds -import pkg/questionable import pkg/questionable/results -import pkg/stint import pkg/taskpools import pkg/codexdht/discv5/protocol as discv5 @@ -22,7 +20,6 @@ import pkg/storage/blockexchange import pkg/storage/chunker import pkg/storage/manifest import pkg/storage/discovery -import pkg/storage/merkletree import pkg/storage/blocktype as bt import pkg/storage/rng diff --git a/tests/storage/slots/helpers.nim b/tests/storage/slots/helpers.nim index e476cfbd..3aae8d3e 100644 --- a/tests/storage/slots/helpers.nim +++ b/tests/storage/slots/helpers.nim @@ -9,8 +9,6 @@ import pkg/storage/merkletree import pkg/storage/manifest import pkg/storage/blocktype as bt import pkg/storage/chunker -import pkg/storage/rng -import pkg/taskpools import ../helpers diff --git a/tests/storage/stores/testkeyutils.nim b/tests/storage/stores/testkeyutils.nim index 0f75a2ed..7c0d4950 100644 --- a/tests/storage/stores/testkeyutils.nim +++ b/tests/storage/stores/testkeyutils.nim @@ -14,12 +14,8 @@ import pkg/questionable/results import pkg/libp2p import pkg/storage/blocktype as bt import pkg/storage/stores/repostore -import pkg/storage/clock import ../../asynctest -import ../helpers/mocktimer -import ../helpers/mockrepostore -import ../helpers/mockclock import ../examples import storage/namespaces diff --git a/tests/storage/testmanifest.nim b/tests/storage/testmanifest.nim index 01e5f859..6012bc1e 100644 --- a/tests/storage/testmanifest.nim +++ b/tests/storage/testmanifest.nim @@ -4,8 +4,6 @@ import pkg/storage/chunker import pkg/storage/blocktype as bt import pkg/storage/manifest -import pkg/storage/merkletree - import ../asynctest import ./helpers import ./examples diff --git a/tests/storage/testnat.nim b/tests/storage/testnat.nim index d8539cb5..21faa156 100644 --- a/tests/storage/testnat.nim +++ b/tests/storage/testnat.nim @@ -1,10 +1,9 @@ -import std/[unittest, options, net] +import std/[unittest, net] import pkg/chronos import pkg/libp2p/[multiaddress, multihash, multicodec] import pkg/results import ../../storage/nat -import ../../storage/utils/natutils import ../../storage/utils suite "NAT Address Tests": diff --git a/vendor/nim-eth b/vendor/nim-eth deleted file mode 160000 index d9135e6c..00000000 --- a/vendor/nim-eth +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d9135e6c3c5d6d819afdfb566aa8d958756b73a8 diff --git a/vendor/nim-ethers b/vendor/nim-ethers deleted file mode 160000 index 965b8cd7..00000000 --- a/vendor/nim-ethers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 965b8cd752544df96b5effecbbd27a8f56a25d62 diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc deleted file mode 160000 index b6e40a77..00000000 --- a/vendor/nim-json-rpc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b6e40a776fa2d00b97a9366761fb7da18f31ae5c diff --git a/vendor/nim-nitro b/vendor/nim-nitro deleted file mode 160000 index 5ccdeb46..00000000 --- a/vendor/nim-nitro +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5ccdeb46e06dcf5cef80d0acbb80ee8a17d596e7