results: use canonical import (#2248)

2025-02-25 18:35:32 +00:00 · 2024-05-30 14:54:03 +02:00 · 2024-05-30 14:54:03 +02:00 · 919242c98e
commit 919242c98e
parent 198e9c6c98
76 changed files with 126 additions and 97 deletions
--- a/fluffy/common/common_types.nim
+++ b/fluffy/common/common_types.nim
@ -7,7 +7,7 @@

 {.push raises: [].}

-import ssz_serialization, eth/rlp, stew/[byteutils, results], nimcrypto/hash
+import results, ssz_serialization, eth/rlp, stew/byteutils, nimcrypto/hash

 export hash

--- a/fluffy/database/content_db.nim
+++ b/fluffy/database/content_db.nim
@ -11,7 +11,7 @@ import
  chronicles,
  metrics,
  stint,
-  stew/results,
+  results,
  eth/db/kvstore,
  eth/db/kvstore_sqlite3,
  ../network/state/state_content,
--- a/fluffy/eth_data/history_data_json_store.nim
+++ b/fluffy/eth_data/history_data_json_store.nim
@ -10,7 +10,8 @@
 import
  json_serialization,
  json_serialization/std/tables,
-  stew/[byteutils, io2, results],
+  results,
+  stew/[byteutils, io2],
  chronicles,
  eth/[rlp, common/eth_types],
  ../../nimbus/common/[chain_config, genesis],
--- a/fluffy/eth_data/history_data_ssz_e2s.nim
+++ b/fluffy/eth_data/history_data_ssz_e2s.nim
@ -8,8 +8,9 @@
 {.push raises: [].}

 import
-  stew/[byteutils, io2, results],
+  stew/[byteutils, io2],
  chronicles,
+  results,
  eth/[rlp, common/eth_types],
  ncli/e2store,
  ../network/history/[history_content, accumulator]
--- a/fluffy/fluffy.nim
+++ b/fluffy/fluffy.nim
@ -18,7 +18,8 @@ import
  metrics/chronos_httpserver,
  json_rpc/clients/httpclient,
  json_rpc/rpcproxy,
-  stew/[byteutils, io2, results],
+  results,
+  stew/[byteutils, io2],
  eth/keys,
  eth/net/nat,
  eth/p2p/discoveryv5/protocol as discv5_protocol,
--- a/fluffy/logging.nim
+++ b/fluffy/logging.nim
@ -17,7 +17,7 @@ import
  pkg/chronicles,
  pkg/chronicles/helpers,
  chronicles/topics_registry,
-  pkg/stew/results
+  pkg/results

 export results

--- a/fluffy/network/beacon/beacon_content.nim
+++ b/fluffy/network/beacon/beacon_content.nim
@ -9,7 +9,8 @@

 import
  std/typetraits,
-  stew/[arrayops, results],
+  stew/arrayops,
+  results,
  beacon_chain/spec/forks,
  beacon_chain/spec/datatypes/altair,
  nimcrypto/[sha2, hash],
--- a/fluffy/network/beacon/beacon_db.nim
+++ b/fluffy/network/beacon/beacon_db.nim
@ -13,7 +13,7 @@ import
  eth/db/kvstore,
  eth/db/kvstore_sqlite3,
  stint,
-  stew/results,
+  results,
  ssz_serialization,
  beacon_chain/db_limits,
  beacon_chain/spec/datatypes/[phase0, altair, bellatrix],
--- a/fluffy/network/beacon/beacon_light_client_manager.nim
+++ b/fluffy/network/beacon/beacon_light_client_manager.nim
@ -11,7 +11,8 @@ import
  std/typetraits,
  chronos,
  chronicles,
-  stew/[base10, results],
+  stew/base10,
+  results,
  eth/p2p/discoveryv5/random2,
  beacon_chain/spec/datatypes/[phase0, altair, bellatrix, capella, deneb],
  beacon_chain/spec/[forks_light_client, digest],
--- a/fluffy/network/beacon/beacon_network.nim
+++ b/fluffy/network/beacon/beacon_network.nim
@ -8,7 +8,7 @@
 {.push raises: [].}

 import
-  stew/results,
+  results,
  chronos,
  chronicles,
  eth/p2p/discoveryv5/[protocol, enr],
--- a/fluffy/network/history/beacon_chain_block_proof_bellatrix.nim
+++ b/fluffy/network/history/beacon_chain_block_proof_bellatrix.nim
@ -74,7 +74,7 @@
 {.push raises: [].}

 import
-  stew/results,
+  results,
  ssz_serialization,
  ssz_serialization/[proofs, merkleization],
  beacon_chain/spec/eth2_ssz_serialization,
--- a/fluffy/network/history/beacon_chain_historical_roots.nim
+++ b/fluffy/network/history/beacon_chain_historical_roots.nim
@ -20,7 +20,7 @@

 {.push raises: [].}

-import stew/results, beacon_chain/spec/forks, beacon_chain/spec/datatypes/bellatrix
+import results, beacon_chain/spec/forks, beacon_chain/spec/datatypes/bellatrix

 export results

--- a/fluffy/network/history/experimental/beacon_chain_block_proof_capella.nim
+++ b/fluffy/network/history/experimental/beacon_chain_block_proof_capella.nim
@ -24,7 +24,7 @@
 {.push raises: [].}

 import
-  stew/results,
+  results,
  ssz_serialization,
  ssz_serialization/[proofs, merkleization],
  beacon_chain/spec/eth2_ssz_serialization,
--- a/fluffy/network/history/history_content.nim
+++ b/fluffy/network/history/history_content.nim
@ -12,7 +12,8 @@
 import
  std/math,
  nimcrypto/[sha2, hash],
-  stew/[byteutils, results],
+  stew/byteutils,
+  results,
  stint,
  ssz_serialization,
  ../../common/common_types
--- a/fluffy/network/history/history_network.nim
+++ b/fluffy/network/history/history_network.nim
@ -8,7 +8,7 @@
 {.push raises: [].}

 import
-  stew/results,
+  results,
  chronos,
  chronicles,
  eth/[common/eth_types_rlp, rlp, trie, trie/db],
--- a/fluffy/network/wire/messages.nim
+++ b/fluffy/network/wire/messages.nim
@ -11,7 +11,7 @@
 {.push raises: [].}

 import
-  stint, stew/[results, objects, endians2], ssz_serialization, ../../common/common_types
+  stint, stew/[objects, endians2], ssz_serialization, ../../common/common_types, results

 export ssz_serialization, stint, common_types

--- a/fluffy/network/wire/portal_protocol.nim
+++ b/fluffy/network/wire/portal_protocol.nim
@ -12,7 +12,8 @@

 import
  std/[sequtils, sets, algorithm, tables],
-  stew/[results, byteutils, leb128, endians2],
+  stew/[byteutils, leb128, endians2],
+  results,
  chronicles,
  chronos,
  nimcrypto/hash,
--- a/fluffy/rpc/rpc_types.nim
+++ b/fluffy/rpc/rpc_types.nim
@ -10,7 +10,8 @@
 import
  stint,
  json_rpc/jsonmarshal,
-  stew/[results, byteutils],
+  stew/[byteutils],
+  results,
  eth/p2p/discoveryv5/[routing_table, enr, node]

 export jsonmarshal, routing_table, enr, node
--- a/fluffy/tests/beacon_network_tests/test_beacon_content.nim
+++ b/fluffy/tests/beacon_network_tests/test_beacon_content.nim
@ -11,7 +11,7 @@ import
  unittest2,
  stew/byteutils,
  stew/io2,
-  stew/results,
+  results,
  beacon_chain/networking/network_metadata,
  beacon_chain/spec/forks,
  beacon_chain/spec/datatypes/altair,
--- a/fluffy/tests/portal_spec_tests/mainnet/test_history_content_validation.nim
+++ b/fluffy/tests/portal_spec_tests/mainnet/test_history_content_validation.nim
@ -12,7 +12,8 @@
 import
  unittest2,
  stint,
-  stew/[byteutils, results],
+  stew/byteutils,
+  results,
  eth/[common/eth_types, rlp],
  ../../../common/common_types,
  ../../../eth_data/history_data_json_store,
--- a/fluffy/tests/portal_spec_tests/mainnet/test_portal_wire_encoding.nim
+++ b/fluffy/tests/portal_spec_tests/mainnet/test_portal_wire_encoding.nim
@ -10,7 +10,8 @@
 import
  unittest2,
  stint,
-  stew/[byteutils, results],
+  stew/byteutils,
+  results,
  eth/p2p/discoveryv5/enr,
  ../../../network/wire/messages

--- a/fluffy/tests/state_network_tests/test_state_gossip_getparent_genesis.nim
+++ b/fluffy/tests/state_network_tests/test_state_gossip_getparent_genesis.nim
@ -10,7 +10,7 @@
 import
  std/os,
  unittest2,
-  stew/results,
+  results,
  eth/[common, trie, trie/db],
  ../../../nimbus/common/chain_config,
  ../../network/state/[state_content, state_validation, state_gossip, state_utils],
--- a/fluffy/tests/state_network_tests/test_state_validation_genesis.nim
+++ b/fluffy/tests/state_network_tests/test_state_validation_genesis.nim
@ -10,7 +10,7 @@
 import
  std/os,
  unittest2,
-  stew/results,
+  results,
  eth/[common, trie, trie/trie_defs],
  ../../../nimbus/common/chain_config,
  ../../network/state/[state_content, state_validation],
--- a/fluffy/tests/test_history_util.nim
+++ b/fluffy/tests/test_history_util.nim
@ -8,9 +8,7 @@
 {.push raises: [].}

 import
-  stew/results,
-  eth/common/eth_types_rlp,
-  ../network/history/[history_content, accumulator]
+  results, eth/common/eth_types_rlp, ../network/history/[history_content, accumulator]

 export results, accumulator, history_content

--- a/fluffy/tests/test_portal_wire_protocol.nim
+++ b/fluffy/tests/test_portal_wire_protocol.nim
@ -11,7 +11,7 @@ import
  std/[algorithm, sequtils],
  chronos,
  testutils/unittests,
-  stew/results,
+  results,
  eth/keys,
  eth/p2p/discoveryv5/routing_table,
  nimcrypto/[hash, sha2],
--- a/fluffy/tools/portalcli.nim
+++ b/fluffy/tools/portalcli.nim
@ -14,7 +14,8 @@ import
  chronos,
  metrics,
  metrics/chronos_httpserver,
-  stew/[byteutils, results],
+  stew/byteutils,
+  results,
  nimcrypto/[hash, sha2],
  eth/[keys, net/nat],
  eth/p2p/discoveryv5/[enr, node],
--- a/hive_integration/nodocker/engine/cancun/blobs.nim
+++ b/hive_integration/nodocker/engine/cancun/blobs.nim
@ -14,7 +14,7 @@ import
  kzg4844/kzg_ex as kzg,
  stew/endians2,
  nimcrypto/sha2,
-  stew/results,
+  results,
  ../../../../nimbus/core/eip4844

 type
--- a/hive_integration/nodocker/engine/engine_env.nim
+++ b/hive_integration/nodocker/engine/engine_env.nim
@ -14,7 +14,7 @@ import
  eth/p2p as eth_p2p,
  chronos,
  json_rpc/[rpcserver, rpcclient],
-  stew/[results],
+  results,
  ../../../nimbus/[
    config,
    constants,
--- a/hive_integration/nodocker/engine/engine_sim.nim
+++ b/hive_integration/nodocker/engine/engine_sim.nim
@ -11,7 +11,7 @@
 import
  std/times,
  chronicles,
-  stew/results,
+  results,
  ./types,
  ../sim_utils,
  ../../../nimbus/core/eip4844
--- a/hive_integration/nodocker/engine/test_env.nim
+++ b/hive_integration/nodocker/engine/test_env.nim
@ -11,7 +11,7 @@
 import
  chronicles,
  eth/keys,
-  stew/results,
+  results,
  json_rpc/rpcclient,
  ../../../nimbus/config,
  ../../../nimbus/common,
--- a/hive_integration/nodocker/rpc/test_env.nim
+++ b/hive_integration/nodocker/rpc/test_env.nim
@ -10,7 +10,7 @@
 import
  std/[os, net],
  eth/p2p as ethp2p,
-  stew/results,
+  results,
  chronos, json_rpc/[rpcserver, rpcclient],
  ../../../nimbus/sync/protocol,
  ../../../nimbus/common,
--- a/nimbus/beacon/api_handler/api_forkchoice.nim
+++ b/nimbus/beacon/api_handler/api_forkchoice.nim
@ -10,7 +10,7 @@
 import
  std/[typetraits],
  eth/common,
-  stew/results,
+  results,
  ../web3_eth_conv,
  ../beacon_engine,
  web3/execution_types,
--- a/nimbus/beacon/api_handler/api_newpayload.nim
+++ b/nimbus/beacon/api_handler/api_newpayload.nim
@ -9,7 +9,7 @@

 import
  eth/common,
-  stew/results,
+  results,
  ../web3_eth_conv,
  ../beacon_engine,
  web3/execution_types,
--- a/nimbus/beacon/api_handler/api_utils.nim
+++ b/nimbus/beacon/api_handler/api_utils.nim
@ -12,7 +12,8 @@ import
  eth/[rlp],
  json_rpc/errors,
  nimcrypto/[hash, sha2],
-  stew/[results, endians2],
+  stew/endians2,
+  results,
  ../../constants,
  ../../db/core_db,
  ../../utils/utils,
--- a/nimbus/common/context.nim
+++ b/nimbus/common/context.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2021 Status Research & Development GmbH
+# Copyright (c) 2021-2024 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT))
@ -10,7 +10,8 @@
 import
  std/[strutils, os],
  manager,
-  stew/[results, io2, byteutils],
+  stew/[io2, byteutils],
+  results,
  eth/keys

 export manager
--- a/nimbus/common/manager.nim
+++ b/nimbus/common/manager.nim
@ -11,7 +11,8 @@

 import
  std/[os, json, tables, strutils],
-  stew/[byteutils, results],
+  stew/byteutils,
+  results,
  eth/[keyfile, common, keys],
  json_serialization

@ -29,7 +30,7 @@ type
 proc init*(_: type AccountsManager): AccountsManager =
  discard

-proc loadKeystores*(am: var AccountsManager, path: string): 
+proc loadKeystores*(am: var AccountsManager, path: string):
                      Result[void, string] =
  try:
    createDir(path)
@ -39,7 +40,7 @@ proc loadKeystores*(am: var AccountsManager, path: string):
      am.accounts[address] = NimbusAccount(keystore: data, unlocked: false)
  except CatchableError as exc:
    return err("loadKeystrores: " & exc.msg)
-  
+
  ok()

 proc getAccount*(am: var AccountsManager, address: EthAddress): Result[NimbusAccount, string] =
--- a/nimbus/core/eip4844.nim
+++ b/nimbus/core/eip4844.nim
@ -12,7 +12,7 @@ import
  std/[os, strutils],
  nimcrypto/sha2,
  kzg4844/kzg_ex as kzg,
-  stew/results,
+  results,
  stint,
  ../constants,
  ../common/common
--- a/nimbus/core/executor/process_block.nim
+++ b/nimbus/core/executor/process_block.nim
@ -21,7 +21,7 @@ import
  ./executor_helpers,
  ./process_transaction,
  chronicles,
-  stew/results
+  results

 {.push raises: [].}

--- a/nimbus/core/executor/process_transaction.nim
+++ b/nimbus/core/executor/process_transaction.nim
@ -12,7 +12,7 @@

 import
  std/strutils,
-  stew/results,
+  results,
  ../../common/common,
  ../../db/ledger,
  ../../transaction/call_evm,
--- a/nimbus/core/gaslimit.nim
+++ b/nimbus/core/gaslimit.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018 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)
@ -11,7 +11,7 @@
 import
  ../common/common,
  std/strformat,
-  stew/results,
+  results,
  eth/[eip1559]

 export
--- a/nimbus/core/tx_pool.nim
+++ b/nimbus/core/tx_pool.nim
@ -435,7 +435,8 @@ import
    tx_recover],
  chronicles,
  eth/keys,
-  stew/[keyed_queue, results],
+  stew/keyed_queue,
+  results,
  ../common/common,
  ./casper

--- a/nimbus/core/tx_pool/tx_item.nim
+++ b/nimbus/core/tx_pool/tx_item.nim
@ -18,7 +18,7 @@ import
  ../../utils/utils,
  ./tx_info,
  eth/[common, keys],
-  stew/results
+  results

 {.push raises: [].}

--- a/nimbus/core/tx_pool/tx_tabs.nim
+++ b/nimbus/core/tx_pool/tx_tabs.nim
@ -12,15 +12,16 @@
 ## ======================================================
 ##

+{.push raises: [].}
+
 import
  std/[sequtils, tables],
  ./tx_info,
  ./tx_item,
  ./tx_tabs/[tx_sender, tx_rank, tx_status],
  eth/[common, keys],
-  stew/[keyed_queue, keyed_queue/kq_debug, results, sorted_set]
-
-{.push raises: [].}
+  stew/[keyed_queue, keyed_queue/kq_debug, sorted_set],
+  results

 export
  # bySender/byStatus index operations
--- a/nimbus/core/tx_pool/tx_tabs/tx_rank.nim
+++ b/nimbus/core/tx_pool/tx_tabs/tx_rank.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018 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)
@ -12,13 +12,15 @@
 ## =========================================
 ##

+{.push raises: [].}
+
 import
  std/[tables],
  ../tx_info,
  eth/[common],
-  stew/[results, sorted_set]
+  stew/[sorted_set],
+  results

-{.push raises: [].}

 type
  TxRank* = ##\
--- a/nimbus/core/tx_pool/tx_tabs/tx_sender.nim
+++ b/nimbus/core/tx_pool/tx_tabs/tx_sender.nim
@ -8,6 +8,8 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.

+{.push raises: [].}
+
 ## Transaction Pool Table: `Sender` > `status` | all > `nonce`
 ## ===========================================================
 ##
@ -17,10 +19,10 @@ import
  ../tx_info,
  ../tx_item,
  eth/[common],
-  stew/[results, keyed_queue, keyed_queue/kq_debug, sorted_set],
+  stew/[keyed_queue, keyed_queue/kq_debug, sorted_set],
+  results,
  ../../eip4844

-{.push raises: [].}

 type
  TxSenderNonceRef* = ref object ##\
--- a/nimbus/core/tx_pool/tx_tabs/tx_status.nim
+++ b/nimbus/core/tx_pool/tx_tabs/tx_status.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018 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)
@ -16,7 +16,8 @@ import
  ../tx_info,
  ../tx_item,
  eth/[common],
-  stew/[results, keyed_queue, keyed_queue/kq_debug, sorted_set]
+  stew/[keyed_queue, keyed_queue/kq_debug, sorted_set],
+  results

 {.push raises: [].}

--- a/nimbus/core/validate.nim
+++ b/nimbus/core/validate.nim
@ -20,7 +20,8 @@ import
  ./pow/[difficulty, header],
  ./pow,
  nimcrypto/utils as cryptoutils,
-  stew/[objects, results]
+  stew/objects,
+  results

 from stew/byteutils
  import nil
--- a/nimbus/core/withdrawals.nim
+++ b/nimbus/core/withdrawals.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2022 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@ -9,7 +9,7 @@
 # according to those terms.

 import
-  stew/results,
+  results,
  ../common/common

 {.push raises: [].}
--- a/nimbus/db/kvstore_rocksdb.nim
+++ b/nimbus/db/kvstore_rocksdb.nim
@ -12,7 +12,7 @@

 import
  std/[os, sequtils],
-  stew/results,
+  results,
  rocksdb,
  eth/db/kvstore

--- a/nimbus/evm/precompiles.nim
+++ b/nimbus/evm/precompiles.nim
@ -10,7 +10,7 @@

 import
  std/[macros],
-  stew/results,
+  results,
  "."/[types, blake2b_f, blscurve],
  ./interpreter/[gas_meter, gas_costs, utils/utils_numeric],
  ../errors, eth/[common, keys], chronicles,
--- a/nimbus/graphql/ethapi.nim
+++ b/nimbus/graphql/ethapi.nim
@ -9,7 +9,8 @@

 import
  std/[strutils],
-  stew/[results, byteutils], stint,
+  stew/byteutils, stint,
+  results,
  eth/common/eth_types_rlp, chronos,
  graphql, graphql/graphql as context,
  graphql/common/types, graphql/httpserver,
--- a/nimbus/rpc/jwt_auth.nim
+++ b/nimbus/rpc/jwt_auth.nim
@ -23,7 +23,8 @@ import
  chronos/apps/http/httpserver,
  httputils,
  nimcrypto/[hmac, utils],
-  stew/[byteutils, objects, results],
+  stew/[byteutils, objects],
+  results,
  ../config,
  ./jwt_auth_helper,
  ./rpc_server
@ -254,7 +255,7 @@ proc jwtSharedSecret*(rng: ref rand.HmacDrbgContext; config: NimbusConf):
    return err(jwtCreationError)

 proc httpJwtAuth*(key: JwtSharedKey): RpcAuthHook =
-  proc handler(req: HttpRequestRef): Future[HttpResponseRef] 
+  proc handler(req: HttpRequestRef): Future[HttpResponseRef]
         {.gcsafe, async: (raises: [CatchableError]).} =
    let auth = req.headers.getString("Authorization", "?")
    if auth.len < 9 or auth[0..6].cmpIgnoreCase("Bearer ") != 0:
--- a/nimbus/sync/todo/snap/worker/db/hexary_inspect.nim
+++ b/nimbus/sync/todo/snap/worker/db/hexary_inspect.nim
@ -14,7 +14,8 @@ import
  std/[sequtils, strutils, tables],
  chronicles,
  eth/[common, trie/nibbles],
-  stew/[results, byteutils],
+  stew/[byteutils],
+  results,
  "../.."/[constants, range_desc],
  "."/[hexary_desc, hexary_nodes_helper, hexary_paths]

--- a/nimbus/sync/todo/snap/worker/db/hexary_interpolate.nim
+++ b/nimbus/sync/todo/snap/worker/db/hexary_interpolate.nim
@ -1,5 +1,5 @@
 # nimbus-eth1
-# Copyright (c) 2021 Status Research & Development GmbH
+# Copyright (c) 2021-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)
@ -19,7 +19,7 @@
 import
  std/[tables],
  eth/[common, trie/nibbles],
-  stew/results,
+  results,
  "../.."/[constants, range_desc],
  "."/[hexary_desc, hexary_error, hexary_paths]

--- a/nimbus/sync/todo/snap/worker/db/hexary_nearby.nim
+++ b/nimbus/sync/todo/snap/worker/db/hexary_nearby.nim
@ -13,7 +13,7 @@
 import
  std/tables,
  eth/[common, trie/nibbles],
-  stew/results,
+  results,
  ../../range_desc,
  "."/[hexary_desc, hexary_error, hexary_nodes_helper, hexary_paths]

--- a/nimbus/sync/todo/snap/worker/db/hexary_nodes_helper.nim
+++ b/nimbus/sync/todo/snap/worker/db/hexary_nodes_helper.nim
@ -15,7 +15,7 @@
 import
  std/[sequtils, tables],
  eth/[common, trie/nibbles],
-  stew/results,
+  results,
  ../../range_desc,
  "."/[hexary_desc, hexary_error]

--- a/nimbus/sync/todo/snap/worker/db/snapdb_debug.nim
+++ b/nimbus/sync/todo/snap/worker/db/snapdb_debug.nim
@ -13,7 +13,7 @@
 import
  std/[algorithm, sequtils, tables],
  eth/[common, trie/nibbles],
-  stew/results,
+  results,
  ../../range_desc,
  "."/[hexary_debug, hexary_desc, hexary_error, hexary_paths, snapdb_desc]

--- a/nimbus/sync/todo/snap/worker/db/snapdb_pivot.nim
+++ b/nimbus/sync/todo/snap/worker/db/snapdb_pivot.nim
@ -1,5 +1,5 @@
 # nimbus-eth1
-# Copyright (c) 2021 Status Research & Development GmbH
+# Copyright (c) 2021-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)
@ -12,7 +12,7 @@

 import
  eth/[common, rlp],
-  stew/results,
+  results,
  ../../range_desc,
  "."/[hexary_error, snapdb_desc, snapdb_persistent]

--- a/nimbus/utils/ec_recover.nim
+++ b/nimbus/utils/ec_recover.nim
@ -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)
@ -21,7 +21,8 @@ import
  ./keyed_queue/kq_rlp,
  ./utils_defs,
  eth/[common, common/transaction, keys, rlp],
-  stew/[keyed_queue, results],
+  stew/keyed_queue,
+  results,
  stint

 export
--- a/nimbus_verified_proxy/block_cache.nim
+++ b/nimbus_verified_proxy/block_cache.nim
@ -7,7 +7,7 @@

 {.push raises: [].}

-import std/tables, web3/primitives, stew/[results, keyed_queue], ./rpc/rpc_utils
+import std/tables, web3/primitives, stew/keyed_queue, results, ./rpc/rpc_utils

 ## Cache for payloads received through block gossip and validated by the
 ## consensus light client.
--- a/nimbus_verified_proxy/rpc/rpc_eth_api.nim
+++ b/nimbus_verified_proxy/rpc/rpc_eth_api.nim
@ -10,7 +10,8 @@
 import
  std/[strutils, typetraits],
  stint,
-  stew/[byteutils, results],
+  stew/byteutils,
+  results,
  chronicles,
  json_rpc/[rpcproxy, rpcserver, rpcclient],
  eth/common/eth_types as etypes,
--- a/nimbus_verified_proxy/validate_proof.nim
+++ b/nimbus_verified_proxy/validate_proof.nim
@ -10,7 +10,7 @@
 import
  std/[sequtils, typetraits, options],
  stint,
-  stew/results,
+  results,
  eth/common/eth_types as etypes,
  eth/common/eth_types_rlp,
  eth/rlp,
--- a/premix/graphql_downloader.nim
+++ b/premix/graphql_downloader.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2021-2023 Status Research & Development GmbH
+# Copyright (c) 2021-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)
@ -10,7 +10,7 @@

 import
  std/json,
-  chronos, stew/results, eth/common,
+  chronos, results, eth/common,
  graphql/httpclient,
  ./parser

--- a/stateless/test_witness_verification.nim
+++ b/stateless/test_witness_verification.nim
@ -10,7 +10,7 @@
 import
  std/os,
  unittest2,
-  stew/results,
+  results,
  eth/[common, trie/trie_defs],
  ../nimbus/db/[ledger, core_db],
  ../nimbus/common/chain_config,
--- a/stateless/witness_verification.nim
+++ b/stateless/witness_verification.nim
@ -11,7 +11,7 @@ import
  std/tables,
  stint,
  eth/[common, rlp],
-  stew/results,
+  results,
  ../nimbus/db/[core_db, state_db],
  ./[tree_from_witness, witness_types]

--- a/tests/replay/gunzip.nim
+++ b/tests/replay/gunzip.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2021-2023 Status Research & Development GmbH
+# Copyright (c) 2021-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)
@ -10,7 +10,7 @@

 import
  std/strutils,
-  stew/results,
+  results,
  zlib

 const
--- a/tests/test_generalstate_json.nim
+++ b/tests/test_generalstate_json.nim
@ -21,7 +21,8 @@ import
  ../tools/common/state_clearing,
  eth/trie/trie_defs,
  unittest2,
-  stew/[results, byteutils]
+  stew/byteutils,
+  results

 type
  TestCtx = object
--- a/tests/test_jwt_auth.nim
+++ b/tests/test_jwt_auth.nim
@ -22,7 +22,7 @@ import
  chronos/apps/http/httptable,
  eth/[common, keys, p2p],
  nimcrypto/[hmac, utils],
-  stew/results,
+  results,
  stint,
  unittest2,
  graphql,
--- a/tests/test_sync_snap/test_helpers.nim
+++ b/tests/test_sync_snap/test_helpers.nim
@ -11,7 +11,8 @@
 import
  std/times,
  eth/common,
-  stew/[interval_set, results],
+  stew/interval_set,
+  results,
  unittest2,
  ../../nimbus/sync/snap/range_desc,
  ../../nimbus/sync/snap/worker/db/hexary_error,
--- a/tests/test_sync_snap/test_node_range.nim
+++ b/tests/test_sync_snap/test_node_range.nim
@ -13,7 +13,8 @@
 import
  std/[sequtils, sets, strformat, strutils],
  eth/[common, p2p, trie/nibbles],
-  stew/[byteutils, interval_set, results],
+  stew/[byteutils, interval_set],
+  results,
  unittest2,
  ../../nimbus/sync/[handlers, protocol, types],
  ../../nimbus/sync/snap/range_desc,
--- a/tests/test_txpool/sign_helper.nim
+++ b/tests/test_txpool/sign_helper.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2022-2023 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@ -14,7 +14,7 @@ import
  ../../nimbus/core/tx_pool/tx_item,
  ../../nimbus/core/clique/clique_desc,
  eth/[common, common/transaction, keys],
-  stew/results,
+  results,
  stint

 const
--- a/tests/test_txpool2.nim
+++ b/tests/test_txpool2.nim
@ -11,7 +11,7 @@
 import
  std/[tables,  os],
  eth/[keys],
-  stew/[byteutils, results], unittest2,
+  stew/byteutils, results, unittest2,
  ../nimbus/db/ledger,
  ../nimbus/core/chain,
  ../nimbus/[config, transaction, constants],
--- a/tools/evmstate/evmstate.nim
+++ b/tools/evmstate/evmstate.nim
@ -12,7 +12,8 @@ import
  std/[json, strutils, sets, tables, options, streams],
  chronicles,
  eth/keys,
-  stew/[results, byteutils],
+  stew/byteutils,
+  results,
  stint,
  eth/trie/[trie_defs],
  ../../nimbus/[vm_types, vm_state],
--- a/tools/t8n/helpers.nim
+++ b/tools/t8n/helpers.nim
@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2022 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@ -10,7 +10,7 @@

 import
  std/[json, strutils, tables],
-  stew/[byteutils, results],
+  stew/byteutils,
  stint,
  eth/[common, rlp, keys],
  ../../nimbus/transaction,
--- a/tools/t8n/transition.nim
+++ b/tools/t8n/transition.nim
@ -11,7 +11,7 @@
 import
  std/[json, strutils, tables, os, streams],
  eth/[rlp, trie, eip1559],
-  stint, stew/results,
+  stint, results,
  "."/[config, types, helpers],
  ../common/state_clearing,
  ../../nimbus/[vm_types, vm_state, transaction],
--- a/vendor/nim-results
+++ b/vendor/nim-results
@ -1 +1 @@
-Subproject commit dfeef8ba705d7bab3e2073bb44549f0a2562df70
+Subproject commit e2adf66b8bc2f41606e8469a5f0a850d1e545b55