diff --git a/tests/all_tests.nim b/tests/all_tests.nim index 9b42a750f..af36573b8 100644 --- a/tests/all_tests.nim +++ b/tests/all_tests.nim @@ -8,7 +8,6 @@ # All tests except scenarios, which as compiled separately for mainnet and minimal import - chronicles, ./testutil import # Unit test diff --git a/tests/consensus_spec/altair/all_altair_fixtures.nim b/tests/consensus_spec/altair/all_altair_fixtures.nim index 88bfb9e65..2262b81f3 100644 --- a/tests/consensus_spec/altair/all_altair_fixtures.nim +++ b/tests/consensus_spec/altair/all_altair_fixtures.nim @@ -7,9 +7,6 @@ {.used.} -import - chronicles - import ./test_fixture_fork, ./test_fixture_merkle_single_proof, diff --git a/tests/consensus_spec/altair/test_fixture_rewards.nim b/tests/consensus_spec/altair/test_fixture_rewards.nim index 2d2af6c5a..e381fb78d 100644 --- a/tests/consensus_spec/altair/test_fixture_rewards.nim +++ b/tests/consensus_spec/altair/test_fixture_rewards.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2020-2021 Status Research & Development GmbH +# Copyright (c) 2020-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -9,9 +9,7 @@ import # Standard library - os, - # Utilities - stew/results, + std/os, # Beacon chain internals ../../beacon_chain/spec/[beaconstate, validator, helpers, state_transition_epoch], ../../beacon_chain/spec/datatypes/altair, diff --git a/tests/consensus_spec/altair/test_fixture_sanity_slots.nim b/tests/consensus_spec/altair/test_fixture_sanity_slots.nim index 170dde2c4..10b9862de 100644 --- a/tests/consensus_spec/altair/test_fixture_sanity_slots.nim +++ b/tests/consensus_spec/altair/test_fixture_sanity_slots.nim @@ -8,7 +8,6 @@ {.used.} import - chronicles, # Standard library os, strutils, # Beacon chain internals diff --git a/tests/consensus_spec/altair/test_fixture_transition.nim b/tests/consensus_spec/altair/test_fixture_transition.nim index 37e9ea53c..fe771dd4a 100644 --- a/tests/consensus_spec/altair/test_fixture_transition.nim +++ b/tests/consensus_spec/altair/test_fixture_transition.nim @@ -12,7 +12,6 @@ import # Standard library os, sequtils, # Status internal - chronicles, faststreams, streams, # Beacon chain internals ../../../beacon_chain/spec/[state_transition, forks, helpers], diff --git a/tests/consensus_spec/bellatrix/test_fixture_rewards.nim b/tests/consensus_spec/bellatrix/test_fixture_rewards.nim index 5261ecbd0..219826813 100644 --- a/tests/consensus_spec/bellatrix/test_fixture_rewards.nim +++ b/tests/consensus_spec/bellatrix/test_fixture_rewards.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2020-2021 Status Research & Development GmbH +# Copyright (c) 2020-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -9,9 +9,7 @@ import # Standard library - os, - # Utilities - stew/results, + std/os, # Beacon chain internals ../../beacon_chain/spec/[beaconstate, validator, helpers, state_transition_epoch], ../../beacon_chain/spec/datatypes/[altair, bellatrix], diff --git a/tests/consensus_spec/bellatrix/test_fixture_transition.nim b/tests/consensus_spec/bellatrix/test_fixture_transition.nim index 152745e4d..3c4051487 100644 --- a/tests/consensus_spec/bellatrix/test_fixture_transition.nim +++ b/tests/consensus_spec/bellatrix/test_fixture_transition.nim @@ -12,7 +12,6 @@ import # Standard library std/[os, sequtils, strutils], # Status internal - chronicles, faststreams, streams, # Beacon chain internals ../../../beacon_chain/spec/[state_transition, forks, helpers], diff --git a/tests/consensus_spec/phase0/test_fixture_rewards.nim b/tests/consensus_spec/phase0/test_fixture_rewards.nim index 9239a97b9..e2a4a683e 100644 --- a/tests/consensus_spec/phase0/test_fixture_rewards.nim +++ b/tests/consensus_spec/phase0/test_fixture_rewards.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2020-2021 Status Research & Development GmbH +# Copyright (c) 2020-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -9,9 +9,7 @@ import # Standard library - os, - # Utilities - stew/results, + std/os, # Beacon chain internals ../../beacon_chain/spec/[validator, helpers, state_transition_epoch], ../../beacon_chain/spec/datatypes/phase0, diff --git a/tests/slashing_protection/test_fixtures.nim b/tests/slashing_protection/test_fixtures.nim index 94f6b5bae..abb019d0a 100644 --- a/tests/slashing_protection/test_fixtures.nim +++ b/tests/slashing_protection/test_fixtures.nim @@ -1,5 +1,5 @@ # Nimbus -# Copyright (c) 2018-2021 Status Research & Development GmbH +# Copyright (c) 2018-2022 Status Research & Development GmbH # Licensed under either of # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0) # * MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT) @@ -9,10 +9,9 @@ import # Standard library - std/[os], + std/os, # Status lib stew/[results, byteutils], - nimcrypto/utils, chronicles, # Internal ../../beacon_chain/validators/[slashing_protection, slashing_protection_v2], @@ -264,4 +263,4 @@ suite "Slashing Interchange tests " & preset(): # rather than also checking the actual signing_root skip() else: - runTest(path) \ No newline at end of file + runTest(path) diff --git a/tests/spec_epoch_processing/justification_finalization_helpers.nim b/tests/spec_epoch_processing/justification_finalization_helpers.nim index fdb6a6a6f..b9d49f69d 100644 --- a/tests/spec_epoch_processing/justification_finalization_helpers.nim +++ b/tests/spec_epoch_processing/justification_finalization_helpers.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2018-2021 Status Research & Development GmbH +# Copyright (c) 2018-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -7,7 +7,7 @@ import # Standard library - strformat, tables, + std/strformat, # Specs ../../beacon_chain/spec/datatypes/phase0, ../../beacon_chain/spec/[beaconstate, validator, helpers], diff --git a/tests/test_block_dag.nim b/tests/test_block_dag.nim index cf31aba4c..7f32b4a74 100644 --- a/tests/test_block_dag.nim +++ b/tests/test_block_dag.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2018-2021 Status Research & Development GmbH +# Copyright (c) 2018-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -8,7 +8,6 @@ {.used.} import - chronicles, unittest2, ../beacon_chain/consensus_object_pools/block_dag diff --git a/tests/test_block_processor.nim b/tests/test_block_processor.nim index 3e8e0a208..0cf842e8c 100644 --- a/tests/test_block_processor.nim +++ b/tests/test_block_processor.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2018-2021 Status Research & Development GmbH +# Copyright (c) 2018-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -8,7 +8,7 @@ {.used.} import - chronicles, chronos, + chronos, std/[options, sequtils], unittest2, eth/keys, taskpools, diff --git a/tests/test_block_quarantine.nim b/tests/test_block_quarantine.nim index 9998fa45b..8fb0ccb21 100644 --- a/tests/test_block_quarantine.nim +++ b/tests/test_block_quarantine.nim @@ -8,7 +8,6 @@ {.used.} import - chronicles, unittest2, ../beacon_chain/spec/forks, ../beacon_chain/spec/datatypes/phase0, diff --git a/tests/test_blockchain_dag.nim b/tests/test_blockchain_dag.nim index 3af755cee..440a10607 100644 --- a/tests/test_blockchain_dag.nim +++ b/tests/test_blockchain_dag.nim @@ -8,9 +8,7 @@ {.used.} import - chronicles, unittest2, - stew/assign2, eth/keys, taskpools, ../beacon_chain/spec/datatypes/base, ../beacon_chain/spec/[beaconstate, forks, helpers, signatures, state_transition], diff --git a/tests/test_engine_authentication.nim b/tests/test_engine_authentication.nim index 857285e32..81df1c7bc 100644 --- a/tests/test_engine_authentication.nim +++ b/tests/test_engine_authentication.nim @@ -8,7 +8,7 @@ {.used.} import - std/[json, options, sequtils], + std/[json, sequtils], unittest2, ../beacon_chain/spec/engine_authentication diff --git a/tests/test_exit_pool.nim b/tests/test_exit_pool.nim index 0aa2e1845..58acac40c 100644 --- a/tests/test_exit_pool.nim +++ b/tests/test_exit_pool.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2020 Status Research & Development GmbH +# Copyright (c) 2020-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -7,8 +7,7 @@ {.used.} -import chronicles, chronos -import eth/keys +import chronos import ../beacon_chain/spec/[datatypes/base, forks, presets] import ../beacon_chain/consensus_object_pools/[ block_quarantine, blockchain_dag, exit_pool] diff --git a/tests/test_gossip_validation.nim b/tests/test_gossip_validation.nim index e3367594d..ad7810a89 100644 --- a/tests/test_gossip_validation.nim +++ b/tests/test_gossip_validation.nim @@ -12,12 +12,12 @@ import std/sequtils, # Status lib unittest2, - chronicles, chronos, + chronos, eth/keys, taskpools, # Internal ../beacon_chain/[beacon_clock], ../beacon_chain/gossip_processing/[gossip_validation, batch_validation], - ../beacon_chain/fork_choice/[fork_choice_types, fork_choice], + ../beacon_chain/fork_choice/fork_choice, ../beacon_chain/consensus_object_pools/[ block_quarantine, blockchain_dag, block_clearance, attestation_pool, sync_committee_msg_pool], diff --git a/tests/test_key_splitting.nim b/tests/test_key_splitting.nim index fe169f802..622cca947 100644 --- a/tests/test_key_splitting.nim +++ b/tests/test_key_splitting.nim @@ -1,7 +1,14 @@ +# beacon_chain +# Copyright (c) 2022 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + {.used.} import - std/[json, typetraits, sequtils], + std/[typetraits, sequtils], unittest2, eth/keys, stew/byteutils, ../beacon_chain/spec/[crypto, keystore], ./testutil diff --git a/tests/test_keymanager_api.nim b/tests/test_keymanager_api.nim index 5ba0e95d6..bd43ed701 100644 --- a/tests/test_keymanager_api.nim +++ b/tests/test_keymanager_api.nim @@ -11,7 +11,7 @@ import std/[typetraits, os, options, json, sequtils, uri, algorithm], testutils/unittests, chronicles, stint, json_serialization, confutils, chronos, eth/keys, blscurve, libp2p/crypto/crypto as lcrypto, - stew/[byteutils, io2], stew/shims/net, nimcrypto/utils, + stew/[byteutils, io2], stew/shims/net, ../beacon_chain/spec/[crypto, keystore, eth2_merkleization], ../beacon_chain/spec/datatypes/base, diff --git a/tests/test_keystore.nim b/tests/test_keystore.nim index adbe7de69..893a9e7ee 100644 --- a/tests/test_keystore.nim +++ b/tests/test_keystore.nim @@ -12,7 +12,6 @@ import unittest2, stew/byteutils, blscurve, eth/keys, json_serialization, libp2p/crypto/crypto as lcrypto, - nimcrypto/utils as ncrutils, ../beacon_chain/spec/[crypto, keystore], ./testutil diff --git a/tests/test_keystore_management.nim b/tests/test_keystore_management.nim index ae51946f4..317fe4d7f 100644 --- a/tests/test_keystore_management.nim +++ b/tests/test_keystore_management.nim @@ -10,11 +10,10 @@ import std/[os, options, json, typetraits, uri, algorithm], unittest2, chronos, chronicles, stint, json_serialization, - blscurve, eth/keys, nimcrypto/utils, + blscurve, eth/keys, libp2p/crypto/crypto as lcrypto, stew/[io2, byteutils], ../beacon_chain/filepath, - ../beacon_chain/networking/network_metadata, ../beacon_chain/spec/eth2_merkleization, ../beacon_chain/spec/datatypes/base, ../beacon_chain/spec/[crypto, keystore], diff --git a/tests/test_light_client.nim b/tests/test_light_client.nim index 59c27fd80..54d46ff46 100644 --- a/tests/test_light_client.nim +++ b/tests/test_light_client.nim @@ -12,7 +12,7 @@ import # Status libraries - chronicles, eth/keys, stew/objects, taskpools, + eth/keys, stew/objects, taskpools, # Beacon chain internals ../beacon_chain/consensus_object_pools/ [block_clearance, block_quarantine, blockchain_dag], diff --git a/tests/test_remote_keystore.nim b/tests/test_remote_keystore.nim index 40744d668..d26129c10 100644 --- a/tests/test_remote_keystore.nim +++ b/tests/test_remote_keystore.nim @@ -8,10 +8,9 @@ {.used.} import - std/[json, typetraits], + std/typetraits, unittest2, json_serialization, - blscurve, eth/keys, libp2p/crypto/crypto as lcrypto, - nimcrypto/utils as ncrutils, + blscurve, ../beacon_chain/spec/[crypto, keystore], ./testutil diff --git a/tests/teststateutil.nim b/tests/teststateutil.nim index 3c9904126..cf7c0dae1 100644 --- a/tests/teststateutil.nim +++ b/tests/teststateutil.nim @@ -8,7 +8,7 @@ {.push raises: [Defect].} import - options, stew/endians2, + std/options, ./mocking/mock_deposits, ./helpers/math_helpers, ../beacon_chain/spec/[