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

Adjust test names and comments for `blobGasUsed` field (#661) 

`blobGasUsed` was not mentioned in `test_rlp_codec` test names, despite
being used. Further, update the idea of `genOptionalFieldsValidation`
to also check for `blobGasUsed`, and fix the check to catch unsupported
combinations of optional fields.
This commit is contained in:
Etan Kissling 2024-01-16 22:02:06 +01:00 committed by GitHub
parent e5e695c396
commit a6f79a6000
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eth/rlp/writer.nim
View File

@ -228,11 +228,15 @@ macro genOptionalFieldsValidation(obj: untyped, T: type, num: static[int]): unty
# generate something like # generate something like
when false: when false:
if obj.excessBlobGas.isSome: if obj.fee.isNone:
doAssert(obj.withdrawalsRoot.isSome, "withdrawalsRoot expected") doAssert(obj.withdrawalsRoot.isNone, "withdrawalsRoot needs fee")
doAssert(obj.fee.isSome, "fee expected") doAssert(obj.blobGasUsed.isNone, "blobGasUsed needs fee")
if obj.withdrawalsRoot.isSome: doAssert(obj.excessBlobGas.isNone, "excessBlobGas needs fee")
doAssert(obj.fee.isSome, "fee expected") if obj.withdrawalsRoot.isNone:
doAssert(obj.blobGasUsed.isNone, "blobGasUsed needs withdrawalsRoot")
doAssert(obj.excessBlobGas.isNone, "excessBlobGas needs withdrawalsRoot")
doAssert obj.blobGasUsed.isSome == obj.excessBlobGas.isSome,
"blobGasUsed and excessBlobGas must both be present or absent"
macro countFieldsRuntimeImpl(obj: untyped, T: type, num: static[int]): untyped = macro countFieldsRuntimeImpl(obj: untyped, T: type, num: static[int]): untyped =
let let

12
tests/rlp/test_rlp_codec.nim
View File

@ -61,7 +61,8 @@ suite "BlockHeader roundtrip test":
expect AssertionDefect: expect AssertionDefect:
roundTrip(h) roundTrip(h)
test "Header + none(baseFee) + some(withdrawalsRoot) + some(excessBlobGas)": test "Header + none(baseFee) + some(withdrawalsRoot) + " &
"some(blobGasUsed) + some(excessBlobGas)":
let h = BlockHeader( let h = BlockHeader(
withdrawalsRoot: some(Hash256()), withdrawalsRoot: some(Hash256()),
blobGasUsed: some(1'u64), blobGasUsed: some(1'u64),
@ -70,7 +71,8 @@ suite "BlockHeader roundtrip test":
expect AssertionDefect: expect AssertionDefect:
roundTrip(h) roundTrip(h)
test "Header + none(baseFee) + none(withdrawalsRoot) + some(excessBlobGas)": test "Header + none(baseFee) + none(withdrawalsRoot) + " &
"some(blobGasUsed) + some(excessBlobGas)":
let h = BlockHeader( let h = BlockHeader(
blobGasUsed: some(1'u64), blobGasUsed: some(1'u64),
excessBlobGas: some(1'u64) excessBlobGas: some(1'u64)
@ -78,7 +80,8 @@ suite "BlockHeader roundtrip test":
expect AssertionDefect: expect AssertionDefect:
roundTrip(h) roundTrip(h)
test "Header + some(baseFee) + none(withdrawalsRoot) + some(excessBlobGas)": test "Header + some(baseFee) + none(withdrawalsRoot) + " &
"some(blobGasUsed) + some(excessBlobGas)":
let h = BlockHeader( let h = BlockHeader(
fee: some(2.u256), fee: some(2.u256),
blobGasUsed: some(1'u64), blobGasUsed: some(1'u64),
@ -94,7 +97,8 @@ suite "BlockHeader roundtrip test":
) )
roundTrip(h) roundTrip(h)
test "Header + some(baseFee) + some(withdrawalsRoot) + some(excessBlobGas)": test "Header + some(baseFee) + some(withdrawalsRoot) + " &
"some(blobGasUsed) + some(excessBlobGas)":
let h = BlockHeader( let h = BlockHeader(
fee: some(2.u256), fee: some(2.u256),
withdrawalsRoot: some(Hash256()), withdrawalsRoot: some(Hash256()),