Bump nim-eth and remove all now unneeded p2p related imports (#1273)

This commit is contained in:
Kim De Mey 2022-10-20 10:34:59 +02:00 committed by GitHub
parent 096d93ab31
commit 74a83c1229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 11 additions and 13 deletions

View File

@ -11,8 +11,6 @@ import
json_serialization, json_serialization/std/tables, json_serialization, json_serialization/std/tables,
stew/[byteutils, io2, results], chronicles, stew/[byteutils, io2, results], chronicles,
eth/[rlp, common/eth_types], eth/[rlp, common/eth_types],
# TODO: `NetworkId` should not be in these private types
eth/p2p/private/p2p_types,
../../nimbus/[chain_config, genesis], ../../nimbus/[chain_config, genesis],
../network/history/[history_content, accumulator] ../network/history/[history_content, accumulator]

View File

@ -9,7 +9,7 @@
import import
std/[os, json, strutils, times], std/[os, json, strutils, times],
eth/[common, trie/db, p2p], stew/byteutils, eth/[common, trie/db], stew/byteutils,
../../../nimbus/db/db_chain, ../../../nimbus/db/db_chain,
../../../nimbus/[genesis, chain_config, conf_utils], ../../../nimbus/[genesis, chain_config, conf_utils],
../sim_utils, ../sim_utils,

View File

@ -22,7 +22,7 @@ import
confutils/std/net confutils/std/net
], ],
stew/shims/net as stewNet, stew/shims/net as stewNet,
eth/[p2p, common, net/nat, p2p/bootnodes], eth/[common, net/nat, p2p/bootnodes, p2p/enode],
"."/[db/select_backend, chain_config, "."/[db/select_backend, chain_config,
constants, vm_compile_info, version constants, vm_compile_info, version
] ]

View File

@ -8,7 +8,7 @@
import import
std/[sequtils, algorithm], std/[sequtils, algorithm],
stew/[byteutils], eth/trie/[hexary, db], stew/[byteutils], eth/trie/[hexary, db],
eth/[common, rlp, p2p], chronicles, eth/[common, rlp], chronicles,
".."/[errors, constants, utils, chain_config], ".."/[errors, constants, utils, chain_config],
"."/storage_types "."/storage_types

View File

@ -1,6 +1,6 @@
import import
std/tables, std/tables,
eth/[common, rlp, p2p], eth/[common, rlp],
chronicles, eth/trie/[db, trie_defs], chronicles, eth/trie/[db, trie_defs],
./db/[db_chain, state_db], ./db/[db_chain, state_db],
"."/[constants, chain_config, forks, p2p/gaslimit] "."/[constants, chain_config, forks, p2p/gaslimit]

View File

@ -1,6 +1,6 @@
import import
std/[os, parseopt, strutils], std/[os, parseopt, strutils],
eth/p2p, stint, ../nimbus/config eth/common, stint, ../nimbus/config
from ../nimbus/chain_config import from ../nimbus/chain_config import
MainNet, MainNet,

View File

@ -17,7 +17,7 @@ import
../nimbus/vm_state, ../nimbus/vm_state,
../nimbus/vm_types, ../nimbus/vm_types,
./replay/undump_blocks, ./replay/undump_blocks,
eth/[common, p2p, trie/db], eth/[common, trie/db],
unittest2 unittest2
type type

View File

@ -10,7 +10,7 @@
import import
std/[algorithm, random, sequtils, strformat, strutils, tables, times], std/[algorithm, random, sequtils, strformat, strutils, tables, times],
eth/[common, keys, p2p, rlp, trie/db], eth/[common, keys, rlp, trie/db],
ethash, ethash,
secp256k1/abi, secp256k1/abi,
stew/objects, stew/objects,

View File

@ -1,7 +1,7 @@
import import
std/[os], std/[os],
pkg/[unittest2], pkg/[unittest2],
eth/[p2p, common, keys], eth/[common, keys],
stew/byteutils, stew/byteutils,
../nimbus/[config, chain_config, context], ../nimbus/[config, chain_config, context],
./test_helpers ./test_helpers

View File

@ -34,7 +34,7 @@ import
../nimbus/p2p/chain, ../nimbus/p2p/chain,
./replay/[undump_blocks, pp], ./replay/[undump_blocks, pp],
chronicles, chronicles,
eth/[common, p2p, trie/db], eth/[common, trie/db],
stew/results, stew/results,
unittest2 unittest2

View File

@ -10,7 +10,7 @@
# distributed except according to those terms. # distributed except according to those terms.
import import
eth/p2p eth/common
type type
AccountsSample* = object AccountsSample* = object

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit cc52ef35e4893d6dddd4b1d776e6b8a56f2d945c Subproject commit fef47331c37ee8abb8608037222658737ff498a6