status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-26 13:15:16 +00:00
Code Issues Projects Releases Wiki Activity

update some deprecated stew/results to results imports (#5743)

Browse Source
This commit is contained in:
tersec 2024-01-16 22:37:14 +00:00 committed by GitHub
parent 19860029c2
commit cf1bec7670
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
29 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_chain/beacon_chain_db.nim
View File

@ -9,7 +9,8 @@
import import
std/[typetraits, tables], std/[typetraits, tables],
stew/[arrayops, assign2, byteutils, endians2, io2, objects, results], results,
stew/[arrayops, assign2, byteutils, endians2, io2, objects],
serialization, chronicles, snappy, serialization, chronicles, snappy,
eth/db/[kvstore, kvstore_sqlite3], eth/db/[kvstore, kvstore_sqlite3],
./networking/network_metadata, ./beacon_chain_db_immutable, ./networking/network_metadata, ./beacon_chain_db_immutable,

3
beacon_chain/consensus_object_pools/block_clearance.nim
View File

@ -9,7 +9,8 @@
import import
chronicles, chronicles,
stew/[assign2, results], results,
stew/assign2,
../spec/[ ../spec/[
beaconstate, forks, signatures, signatures_batch, beaconstate, forks, signatures, signatures_batch,
state_transition, state_transition_epoch], state_transition, state_transition_epoch],

4
beacon_chain/consensus_object_pools/blockchain_dag.nim
View File

@ -9,8 +9,8 @@
import import
std/[algorithm, sequtils, tables, sets], std/[algorithm, sequtils, tables, sets],
stew/[arrayops, assign2, byteutils, results], stew/[arrayops, assign2, byteutils],
metrics, snappy, chronicles, metrics, results, snappy, chronicles,
../spec/[beaconstate, eth2_merkleization, eth2_ssz_serialization, helpers, ../spec/[beaconstate, eth2_merkleization, eth2_ssz_serialization, helpers,
state_transition, validator], state_transition, validator],
../spec/forks, ../spec/forks,

2
beacon_chain/consensus_object_pools/spec_cache.nim
View File

@ -9,7 +9,7 @@
import import
std/sequtils, std/sequtils,
stew/results, results,
chronicles, chronicles,
../extras, ../extras,
../spec/[beaconstate, helpers, network, signatures, validator], ../spec/[beaconstate, helpers, network, signatures, validator],

4
beacon_chain/el/el_conf.nim
View File

@ -1,5 +1,5 @@
# beacon_chain # beacon_chain
# Copyright (c) 2023 Status Research & Development GmbH # Copyright (c) 2023-2024 Status Research & Development GmbH
# Licensed and distributed under either of # Licensed and distributed under either of
# * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT). # * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0). # * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
@ -7,7 +7,7 @@
import import
std/[options, uri], std/[options, uri],
stew/results, chronicles, confutils, results, chronicles, confutils,
confutils/toml/defs as confTomlDefs, confutils/toml/defs as confTomlDefs,
confutils/toml/std/net as confTomlNet, confutils/toml/std/net as confTomlNet,
confutils/toml/std/uri as confTomlUri, confutils/toml/std/uri as confTomlUri,

3
beacon_chain/el/el_manager.nim
View File

@ -14,7 +14,8 @@ import
json_rpc/[client, errors], json_rpc/[client, errors],
web3, web3/[engine_api, primitives, conversions], web3, web3/[engine_api, primitives, conversions],
eth/common/[eth_types, transaction], eth/common/[eth_types, transaction],
eth/async_utils, stew/[assign2, byteutils, objects, results, shims/hashes, endians2], eth/async_utils, results,
stew/[assign2, byteutils, objects, shims/hashes, endians2],
# Local modules: # Local modules:
../spec/[deposit_snapshots, eth2_merkleization, forks, helpers], ../spec/[deposit_snapshots, eth2_merkleization, forks, helpers],
../networking/network_metadata, ../networking/network_metadata,

2
beacon_chain/era_db.nim
View File

@ -7,7 +7,7 @@
import import
std/os, std/os,
chronicles, chronicles,
stew/results, snappy, taskpools, results, snappy, taskpools,
../ncli/e2store, ../ncli/e2store,
./spec/datatypes/[altair, bellatrix, phase0], ./spec/datatypes/[altair, bellatrix, phase0],
./spec/[beaconstate, forks, signatures_batch], ./spec/[beaconstate, forks, signatures_batch],

2
beacon_chain/fork_choice/fork_choice.nim
View File

@ -11,7 +11,7 @@ import
# Standard library # Standard library
std/[sequtils, tables], std/[sequtils, tables],
# Status libraries # Status libraries
stew/[results], chronicles, results, chronicles,
# Internal # Internal
../spec/[beaconstate, helpers, state_transition_block], ../spec/[beaconstate, helpers, state_transition_block],
../spec/datatypes/[phase0, altair, bellatrix], ../spec/datatypes/[phase0, altair, bellatrix],

2
beacon_chain/fork_choice/fork_choice_types.nim
View File

@ -11,7 +11,7 @@ import
# Standard library # Standard library
std/tables, std/tables,
# Status # Status
stew/results, results,
chronicles, chronicles,
# Internal # Internal
../spec/datatypes/base, ../spec/datatypes/base,

2
beacon_chain/fork_choice/proto_array.nim
View File

@ -12,7 +12,7 @@ import
std/[tables, typetraits], std/[tables, typetraits],
# Status libraries # Status libraries
chronicles, chronicles,
stew/results, results,
# Internal # Internal
../spec/datatypes/base, ../spec/datatypes/base,
../spec/helpers, ../spec/helpers,

2
beacon_chain/gossip_processing/gossip_validation.nim
View File

@ -10,7 +10,7 @@
import import
# Status # Status
chronicles, chronos, metrics, chronicles, chronos, metrics,
stew/results, results,
# Internals # Internals
../spec/[ ../spec/[
beaconstate, state_transition_block, forks, helpers, network, signatures], beaconstate, state_transition_block, forks, helpers, network, signatures],

3
beacon_chain/networking/eth2_network.nim
View File

@ -12,7 +12,8 @@ import
std/[typetraits, os, sequtils, strutils, algorithm, math, tables, macrocache], std/[typetraits, os, sequtils, strutils, algorithm, math, tables, macrocache],
# Status libs # Status libs
stew/[leb128, endians2, results, byteutils, io2, bitops2], results,
stew/[leb128, endians2, byteutils, io2, bitops2],
stew/shims/net as stewNet, stew/shims/net as stewNet,
stew/shims/[macros], stew/shims/[macros],
snappy, snappy,

2
beacon_chain/nimbus_signing_node.nim
View File

@ -9,7 +9,7 @@ import std/[tables, os, strutils]
import serialization, json_serialization, import serialization, json_serialization,
json_serialization/std/[options, net], json_serialization/std/[options, net],
chronos, presto, presto/secureserver, chronicles, confutils, chronos, presto, presto/secureserver, chronicles, confutils,
stew/[base10, results, byteutils, io2, bitops2] results, stew/[base10, byteutils, io2, bitops2]
import "."/spec/datatypes/[base, altair, phase0], import "."/spec/datatypes/[base, altair, phase0],
"."/spec/[crypto, digest, network, signatures, forks], "."/spec/[crypto, digest, network, signatures, forks],
"."/spec/eth2_apis/[rest_types, eth2_rest_serialization], "."/spec/eth2_apis/[rest_types, eth2_rest_serialization],

2
beacon_chain/rpc/rest_key_management_api.nim
View File

@ -10,7 +10,7 @@
import std/[tables, strutils, uri] import std/[tables, strutils, uri]
import chronos, chronicles, confutils, import chronos, chronicles, confutils,
stew/[base10, results, io2], blscurve, presto results, stew/[base10, io2], blscurve, presto
import ".."/spec/[keystore, crypto] import ".."/spec/[keystore, crypto]
import ".."/spec/eth2_apis/rest_keymanager_types import ".."/spec/eth2_apis/rest_keymanager_types
import ".."/validators/[slashing_protection, keystore_management, import ".."/validators/[slashing_protection, keystore_management,

3
beacon_chain/spec/crypto.nim
View File

@ -25,7 +25,8 @@
import import
# Status # Status
stew/[bitseqs, endians2, objects, results, byteutils], results,
stew/[bitseqs, endians2, objects, byteutils],
blscurve, blscurve,
chronicles, chronicles,
bearssl/rand, bearssl/rand,

3
beacon_chain/spec/datatypes/base.nim
View File

@ -62,7 +62,8 @@
import import
std/[macros, hashes, sets, strutils, tables, typetraits], std/[macros, hashes, sets, strutils, tables, typetraits],
stew/[assign2, byteutils, endians2, results], results,
stew/[assign2, byteutils, endians2],
chronicles, chronicles,
json_serialization, json_serialization,
ssz_serialization/types as sszTypes, ssz_serialization/types as sszTypes,

3
beacon_chain/spec/engine_authentication.nim
View File

@ -9,7 +9,8 @@ import
chronicles, confutils/defs, chronicles, confutils/defs,
bearssl/rand, bearssl/rand,
nimcrypto/[hmac, utils], nimcrypto/[hmac, utils],
stew/[byteutils, results] results,
stew/byteutils
from std/base64 import encode from std/base64 import encode
from std/json import JsonNode, `$`, `%*` from std/json import JsonNode, `$`, `%*`

2
beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim
View File

@ -8,7 +8,7 @@
{.push raises: [].} {.push raises: [].}
import std/[typetraits, strutils] import std/[typetraits, strutils]
import stew/[assign2, results, base10, byteutils, endians2], presto/common, import results, stew/[assign2, base10, byteutils, endians2], presto/common,
libp2p/peerid, serialization, json_serialization, libp2p/peerid, serialization, json_serialization,
json_serialization/std/[net, sets], json_serialization/std/[net, sets],
json_serialization/stew/results as jsonSerializationResults, json_serialization/stew/results as jsonSerializationResults,

3
beacon_chain/spec/eth2_apis/rest_light_client_calls.nim
View File

@ -8,7 +8,8 @@
import import
chronos, chronos,
stew/[results, endians2], results,
stew/endians2,
presto/client, presto/client,
../helpers, ../helpers,
"."/[rest_common, eth2_rest_serialization] "."/[rest_common, eth2_rest_serialization]

3
beacon_chain/spec/eth2_apis/rest_remote_signer_calls.nim
View File

@ -9,7 +9,8 @@
import import
chronicles, metrics, chronicles, metrics,
chronos, presto/client, chronos, presto/client,
stew/[results, base10, byteutils], results,
stew/[base10, byteutils],
"."/[rest_types, eth2_rest_serialization] "."/[rest_types, eth2_rest_serialization]
export chronos, client, rest_types, eth2_rest_serialization, results export chronos, client, rest_types, eth2_rest_serialization, results

2
beacon_chain/spec/forks.nim
View File

@ -9,8 +9,8 @@
import import
std/macros, std/macros,
results,
stew/assign2, stew/assign2,
stew/results,
chronicles, chronicles,
../extras, ../extras,
"."/[ "."/[

3
beacon_chain/spec/keystore.nim
View File

@ -14,7 +14,8 @@ import
# Third-party libraries # Third-party libraries
normalize, normalize,
# Status libraries # Status libraries
stew/[results, bitops2, base10, io2, endians2], stew/shims/macros, results,
stew/[bitops2, base10, io2, endians2], stew/shims/macros,
eth/keyfile/uuid, blscurve, eth/keyfile/uuid, blscurve,
json_serialization, json_serialization/std/options, json_serialization, json_serialization/std/options,
chronos/timer, chronos/timer,

3
beacon_chain/spec/signatures_batch.nim
View File

@ -15,7 +15,8 @@
import import
# Status lib # Status lib
blscurve, blscurve,
stew/[byteutils, results], stew/byteutils,
results,
taskpools, taskpools,
bearssl/rand, bearssl/rand,
# Internal # Internal

2
beacon_chain/spec/state_transition.nim
View File

@ -42,7 +42,7 @@
import import
chronicles, chronicles,
stew/results, results,
../extras, ../extras,
"."/[ "."/[
beaconstate, eth2_merkleization, forks, helpers, signatures, beaconstate, eth2_merkleization, forks, helpers, signatures,

3
beacon_chain/validator_client/common.nim
View File

@ -7,7 +7,8 @@
import import
std/[tables, os, sets, sequtils, strutils, uri, algorithm], std/[tables, os, sets, sequtils, strutils, uri, algorithm],
stew/[base10, results, byteutils], results,
stew/[base10, byteutils],
bearssl/rand, chronos, presto, presto/client as presto_client, bearssl/rand, chronos, presto, presto/client as presto_client,
chronicles, confutils, chronicles, confutils,
metrics, metrics/chronos_httpserver, metrics, metrics/chronos_httpserver,

3
beacon_chain/validators/slashing_protection.nim
View File

@ -12,7 +12,8 @@ import
std/[os, algorithm, sequtils], std/[os, algorithm, sequtils],
# Status # Status
eth/db/[kvstore, kvstore_sqlite3], eth/db/[kvstore, kvstore_sqlite3],
stew/[results, byteutils], results,
stew/byteutils,
chronicles, chronicles/timings, chronicles, chronicles/timings,
# Internal # Internal
../spec/datatypes/base, ../spec/datatypes/base,

3
beacon_chain/validators/slashing_protection_common.nim
View File

@ -11,7 +11,8 @@ import
# Stdlib # Stdlib
std/[typetraits, strutils, algorithm], std/[typetraits, strutils, algorithm],
# Status # Status
stew/[byteutils, results], stew/byteutils,
results,
serialization, serialization,
json_serialization, json_serialization/std/options, json_serialization, json_serialization/std/options,
chronicles, chronicles,

3
ncli/e2store.nim
View File

@ -9,7 +9,8 @@
import import
std/strformat, std/strformat,
stew/[arrayops, endians2, io2, results], results,
stew/[arrayops, endians2, io2],
snappy, snappy,
../beacon_chain/spec/[beacon_time, forks], ../beacon_chain/spec/[beacon_time, forks],
../beacon_chain/spec/eth2_ssz_serialization ../beacon_chain/spec/eth2_ssz_serialization

10
ncli/resttest.nim
View File

@ -5,10 +5,12 @@
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). # * 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. # at your option. This file may not be copied, modified, or distributed except according to those terms.
import std/[strutils, os, options, uri, json, tables] import
import stew/[results, io2, base10] std/[strutils, os, options, uri, json, tables],
import confutils, chronicles, httputils, results,
chronos, chronos/streams/[asyncstream, tlsstream] stew/[io2, base10],
confutils, chronicles, httputils,
chronos, chronos/streams/[asyncstream, tlsstream]
const const
RestTesterName* = "Ethereum2 REST API Tester" RestTesterName* = "Ethereum2 REST API Tester"