status-im
/
nim-eth
mirror of https://github.com/status-im/nim-eth.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

eth_types: remove unused ref types (#685) 

remove unused ref types
This commit is contained in:
Jacek Sieka 2024-05-28 08:42:13 +02:00 committed by GitHub
parent bb5cb6a4d0
commit 258798873c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eth/common/eth_types.nim
View File

@ -195,12 +195,6 @@ type
else: else:
number*: uint64 number*: uint64
BlockHeaderRef* = ref BlockHeader
BlockBodyRef* = ref BlockBody
ReceiptRef* = ref Receipt
EthResourceRefs = BlockHeaderRef | BlockBodyRef | ReceiptRef
ValidationResult* {.pure.} = enum ValidationResult* {.pure.} = enum
OK OK
Error Error
@ -211,7 +205,6 @@ const
Eip1559Receipt* = TxEip1559 Eip1559Receipt* = TxEip1559
Eip4844Receipt* = TxEip4844 Eip4844Receipt* = TxEip4844
# TODO clean these up
EMPTY_ROOT_HASH* = "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421".toDigest EMPTY_ROOT_HASH* = "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421".toDigest
EMPTY_UNCLE_HASH* = "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347".toDigest EMPTY_UNCLE_HASH* = "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347".toDigest
EMPTY_CODE_HASH* = "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470".toDigest EMPTY_CODE_HASH* = "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470".toDigest
@ -251,20 +244,20 @@ else:
n n
# EIP-1559 conveniences # EIP-1559 conveniences
func baseFee*(h: BlockHeader | BlockHeaderRef): UInt256 = func baseFee*(h: BlockHeader): UInt256 =
if h.fee.isSome: if h.fee.isSome:
h.fee.get() h.fee.get()
else: else:
0.u256 0.u256
template `baseFee=`*(h: BlockHeader | BlockHeaderRef, data: UInt256) = template `baseFee=`*(h: BlockHeader, data: UInt256) =
h.fee = some(data) h.fee = some(data)
# starting from EIP-4399, `mixHash`/`mixDigest` field will be alled `prevRandao` # starting from EIP-4399, `mixHash`/`mixDigest` field will be alled `prevRandao`
template prevRandao*(h: BlockHeader | BlockHeaderRef): Hash256 = template prevRandao*(h: BlockHeader): Hash256 =
h.mixDigest h.mixDigest
template `prevRandao=`*(h: BlockHeader | BlockHeaderRef, hash: Hash256) = template `prevRandao=`*(h: BlockHeader, hash: Hash256) =
h.mixDigest = hash h.mixDigest = hash
func toBlockNonce*(n: uint64): BlockNonce = func toBlockNonce*(n: uint64): BlockNonce =
@ -317,11 +310,9 @@ func `$`*(x: BlockHashOrNumber): string =
$x.number $x.number
template hasData*(b: Blob): bool = b.len > 0 template hasData*(b: Blob): bool = b.len > 0
template hasData*(r: EthResourceRefs): bool = r != nil
template deref*(b: Blob): auto = b template deref*(b: Blob): auto = b
template deref*(o: Option): auto = o.get template deref*(o: Option): auto = o.get
template deref*(r: EthResourceRefs): auto = r[]
func `==`*(a, b: NetworkId): bool = func `==`*(a, b: NetworkId): bool =
a.uint == b.uint a.uint == b.uint