From e461248e8656b1a5f1fa2a08f38b1bda39954a69 Mon Sep 17 00:00:00 2001 From: jangko Date: Wed, 9 Mar 2022 21:43:51 +0700 Subject: [PATCH] remove cruft --- nimbus/merge/eth_common_overload.nim | 7 ------- nimbus/vm/state.nim | 4 ---- nimbus/vm2/state.nim | 4 ---- 3 files changed, 15 deletions(-) delete mode 100644 nimbus/merge/eth_common_overload.nim diff --git a/nimbus/merge/eth_common_overload.nim b/nimbus/merge/eth_common_overload.nim deleted file mode 100644 index 01c897b4b..000000000 --- a/nimbus/merge/eth_common_overload.nim +++ /dev/null @@ -1,7 +0,0 @@ -import eth/common - -template prevRandao*(h: BlockHeader | BlockHeaderRef): Hash256 = - h.mixDigest - -template `prevRandao=`*(h: BlockHeader | BlockHeaderRef, hash: Hash256) = - h.mixDigest = hash diff --git a/nimbus/vm/state.nim b/nimbus/vm/state.nim index 7e2233580..f579da403 100644 --- a/nimbus/vm/state.nim +++ b/nimbus/vm/state.nim @@ -22,10 +22,6 @@ import ./types, eth/[common, keys] -# a temporary solution until nim-eth bumped -when not compiles(common.prevRandao): - import ../merge/eth_common_overload - {.push raises: [Defect].} const diff --git a/nimbus/vm2/state.nim b/nimbus/vm2/state.nim index 2fac3309b..f98cdb643 100644 --- a/nimbus/vm2/state.nim +++ b/nimbus/vm2/state.nim @@ -21,10 +21,6 @@ import ./types, eth/[common, keys] -# a temporary solution until nim-eth bumped -when not compiles(common.prevRandao): - import ../merge/eth_common_overload - {.push raises: [Defect].} const