Skip to content

Commit 67a45b0

Browse files
authored
rm references to unused nimbus-eth1-blobs, unused imports (#2993)
1 parent 419e019 commit 67a45b0

File tree

8 files changed

+18
-36
lines changed

8 files changed

+18
-36
lines changed

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,6 @@ rm vendor/Nim/bin/nim
246246
make -j8 build-nim
247247
```
248248

249-
- some programs in the _tests_ subdirectory do a replay of blockchain
250-
database dumps when compiled and run locally. The dumps are found in
251-
[this](https://github.com/status-im/nimbus-eth1-blobs) module which
252-
need to be cloned as _nimbus-eth1-blobs_ parellel to the _nimbus-eth1_
253-
file system root.
254-
255249
#### Git submodule workflow
256250

257251
Working on a dependency:

docker/dist/entry_point.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2020-2024 Status Research & Development GmbH. Licensed under
3+
# Copyright (c) 2020-2025 Status Research & Development GmbH. Licensed under
44
# either of:
55
# - Apache License, version 2.0
66
# - MIT license
@@ -301,7 +301,7 @@ for BINARY in ${BINARIES}; do
301301
| grep -v "failed to insert symbol" \
302302
| grep -v "could not find object file symbol for symbol" \
303303
| grep -v "while processing" \
304-
| grep -v "warning: line table paramters mismatch. Cannot emit." \
304+
| grep -v "warning: line table parameters mismatch. Cannot emit." \
305305
|| true
306306
cp -a "./build/${BINARY}.dSYM" "${DIST_PATH}/build/"
307307
fi

tests/test_aristo.nim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2023-2024 Status Research & Development GmbH
2+
# Copyright (c) 2023-2025 Status Research & Development GmbH
33
# Licensed under either of
44
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
55
# http://www.apache.org/licenses/LICENSE-2.0)
@@ -24,12 +24,12 @@ import
2424
./test_aristo/test_portal_proof,
2525
./test_aristo/test_compute,
2626
./test_aristo/[
27-
test_balancer, test_helpers, test_samples_xx, test_tx,
27+
test_helpers, test_samples_xx, test_tx,
2828
undump_accounts, undump_storages]
2929

3030
const
3131
baseDir = [".", "..", ".."/"..", $DirSep]
32-
repoDir = [".", "tests", "nimbus-eth1-blobs"]
32+
repoDir = [".", "tests"]
3333
subDir = ["replay", "test_aristo", "replay"/"snap"]
3434

3535
# Reference file for finding the database directory

tests/test_aristo/test_merge_proof.nim

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2023-2024 Status Research & Development GmbH
2+
# Copyright (c) 2023-2025 Status Research & Development GmbH
33
# Licensed under either of
44
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
55
# http://www.apache.org/licenses/LICENSE-2.0)
@@ -13,13 +13,11 @@ import
1313
results,
1414
unittest2,
1515
../../nimbus/db/opts,
16-
../../nimbus/db/core_db/backend/aristo_rocksdb,
1716
../../nimbus/db/aristo/[
1817
aristo_check,
1918
aristo_desc,
2019
aristo_init/persistent,
2120
aristo_part,
22-
aristo_part/part_debug,
2321
aristo_tx],
2422
../replay/xcheck,
2523
./test_helpers

tests/test_aristo/test_portal_proof.nim

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2023-2024 Status Research & Development GmbH
2+
# Copyright (c) 2023-2025 Status Research & Development GmbH
33
# Licensed under either of
44
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
55
# http://www.apache.org/licenses/LICENSE-2.0)
@@ -18,8 +18,7 @@ import
1818
unittest2,
1919
../test_helpers,
2020
../../nimbus/db/aristo,
21-
../../nimbus/db/aristo/[aristo_desc, aristo_get, aristo_hike, aristo_layers,
22-
aristo_part],
21+
../../nimbus/db/aristo/[aristo_desc, aristo_get, aristo_hike, aristo_part],
2322
../../nimbus/db/aristo/aristo_part/part_debug
2423

2524
type
@@ -69,7 +68,7 @@ proc preLoadAristoDb(jKvp: JsonNode): PartStateRef =
6968
ps
7069

7170

72-
proc collectAddresses(node: JsonNode, collect: var HashSet[Address]) =
71+
func collectAddresses(node: JsonNode, collect: var HashSet[Address]) =
7372
case node.kind:
7473
of JObject:
7574
for k,v in node.pairs:

tests/test_aristo/test_tx.nim

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2023-2024 Status Research & Development GmbH
2+
# Copyright (c) 2023-2025 Status Research & Development GmbH
33
# Licensed under either of
44
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
55
# http://www.apache.org/licenses/LICENSE-2.0)
@@ -11,23 +11,18 @@
1111
## Aristo (aka Patricia) DB records transaction based merge test
1212

1313
import
14-
std/[algorithm, bitops, sequtils, sets, tables],
14+
std/[algorithm, bitops, sets, tables],
1515
eth/common,
1616
results,
1717
unittest2,
1818
stew/endians2,
1919
../../nimbus/db/opts,
20-
../../nimbus/db/core_db/backend/aristo_rocksdb,
2120
../../nimbus/db/aristo/[
2221
aristo_check,
23-
aristo_debug,
24-
aristo_delete,
2522
aristo_desc,
26-
aristo_get,
2723
aristo_hike,
2824
aristo_init/persistent,
2925
aristo_nearby,
30-
aristo_part,
3126
aristo_part/part_debug,
3227
aristo_tx],
3328
../replay/xcheck,
@@ -48,13 +43,13 @@ const
4843
# Private helpers
4944
# ------------------------------------------------------------------------------
5045

51-
proc posixPrngRand(state: var uint32): byte =
46+
func posixPrngRand(state: var uint32): byte =
5247
## POSIX.1-2001 example of a rand() implementation, see manual page rand(3).
5348
state = state * 1103515245 + 12345;
5449
let val = (state shr 16) and 32767 # mod 2^31
5550
(val shr 8).byte # Extract second byte
5651

57-
proc rand[W: SomeInteger|VertexID](ap: var PrngDesc; T: type W): T =
52+
func rand[W: SomeInteger|VertexID](ap: var PrngDesc; T: type W): T =
5853
var a: array[sizeof T,byte]
5954
for n in 0 ..< sizeof T:
6055
a[n] = ap.prng.posixPrngRand().byte
@@ -73,10 +68,10 @@ proc rand[W: SomeInteger|VertexID](ap: var PrngDesc; T: type W): T =
7368
# That way the result is independent of endianness
7469
(addr result).copyMem(unsafeAddr w, sizeof w)
7570

76-
proc init(T: type PrngDesc; seed: int): PrngDesc =
71+
func init(T: type PrngDesc; seed: int): PrngDesc =
7772
result.prng = (seed and 0x7fffffff).uint32
7873

79-
proc rand(td: var PrngDesc; top: int): int =
74+
func rand(td: var PrngDesc; top: int): int =
8075
if 0 < top:
8176
let mask = (1 shl (8 * sizeof(int) - top.countLeadingZeroBits)) - 1
8277
for _ in 0 ..< 100:

tests/test_coredb.nim

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2023-2024 Status Research & Development GmbH
2+
# Copyright (c) 2023-2025 Status Research & Development GmbH
33
# Licensed under either of
44
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
55
# http://www.apache.org/licenses/LICENSE-2.0)
@@ -340,10 +340,6 @@ when isMainModule:
340340
when true and false:
341341
false.coreDbMain()
342342

343-
# This one uses the readily available dump: `bulkTest0` and some huge replay
344-
# dumps `bulkTest2`, `bulkTest3`, .. from the `nimbus-eth1-blobs` package.
345-
# For specs see `tests/test_coredb/bulk_test_xx.nim`.
346-
347343
sampleList = cmdLineConfig().samples
348344
if sampleList.len == 0:
349345
sampleList = @[memorySampleDefault]

tests/test_tracer_json.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2018-2024 Status Research & Development GmbH
2+
# Copyright (c) 2018-2025 Status Research & Development GmbH
33
# Licensed under either of
44
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
55
# http://www.apache.org/licenses/LICENSE-2.0)
@@ -16,7 +16,7 @@ import
1616
results,
1717
./test_helpers,
1818
../nimbus/db/aristo,
19-
../nimbus/db/aristo/[aristo_desc, aristo_layers, aristo_part],
19+
../nimbus/db/aristo/[aristo_desc, aristo_part],
2020
../nimbus/db/aristo/aristo_part/part_debug,
2121
../nimbus/db/kvt/kvt_utils,
2222
../nimbus/[tracer, evm/types],

0 commit comments

Comments
 (0)