status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-03 07:45:18 +00:00
Code Issues Projects Releases Wiki Activity

Remove trie_defs imports (#2872)

Browse Source
This commit is contained in:
andri lim 2024-11-25 22:37:57 +07:00 committed by GitHub
parent 6e7e63adf5
commit daaf0f2a20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nimbus/common/common.nim
View File

@ -11,7 +11,6 @@
import
chronicles,
eth/trie/trie_defs,
../core/casper,
../db/[core_db, ledger, storage_types],
../utils/[utils, ec_recover],

3
tests/test_generalstate_json.nim
View File

@ -19,7 +19,6 @@ import
../tools/common/helpers as chp,
../tools/evmstate/helpers,
../tools/common/state_clearing,
eth/trie/trie_defs,
eth/common/transaction_utils,
unittest2,
stew/byteutils,
@ -79,7 +78,7 @@ proc dumpDebugData(ctx: TestCtx, vmState: BaseVMState, gasUsed: GasInt, success:
proc testFixtureIndexes(ctx: var TestCtx, testStatusIMPL: var TestStatus) =
let
com = CommonRef.new(newCoreDbRef DefaultDbMemory, ctx.chainConfig)
parent = Header(stateRoot: emptyRlpHash)
parent = Header(stateRoot: emptyRoot)
tracer = if ctx.trace:
newLegacyTracer({})
else:

2
tests/test_getproof_json.nim
View File

@ -12,7 +12,7 @@ import
web3/eth_api,
nimcrypto/[keccak, hash],
eth/common/[keys, eth_types_rlp],
eth/[rlp, trie/trie_defs, trie/hexary_proof_verification],
eth/[rlp, trie/hexary_proof_verification],
../nimbus/db/[ledger, core_db],
../nimbus/common/chain_config,
../nimbus/rpc/server_api

1
tools/evmstate/evmstate.nim
View File

@ -16,7 +16,6 @@ import
stew/byteutils,
results,
stint,
eth/trie/[trie_defs],
../../nimbus/[evm/types, evm/state],
../../nimbus/db/ledger,
../../nimbus/transaction,

5
tools/evmstate/helpers.nim
View File

@ -13,7 +13,6 @@ import
eth/common/keys,
eth/common/headers,
eth/common/transactions,
eth/trie/trie_defs,
stint,
stew/byteutils,
../../nimbus/transaction,
@ -113,7 +112,7 @@ proc parseHeader*(n: JsonNode): Header =
number : required(BlockNumber, "currentNumber"),
gasLimit : required(GasInt, "currentGasLimit"),
timestamp : required(EthTime, "currentTimestamp"),
stateRoot : emptyRlpHash,
stateRoot : emptyRoot,
mixHash : omitZero(Bytes32, "currentRandom"),
baseFeePerGas : optional(UInt256, "currentBaseFee"),
withdrawalsRoot: optional(Hash32, "currentWithdrawalsRoot"),
@ -123,7 +122,7 @@ proc parseHeader*(n: JsonNode): Header =
proc parseParentHeader*(n: JsonNode): Header =
Header(
stateRoot: emptyRlpHash,
stateRoot: emptyRoot,
excessBlobGas: optional(uint64, "parentExcessBlobGas"),
blobGasUsed: optional(uint64, "parentBlobGasUsed"),
)