status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-01-31 21:05:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix linter, add more test helpers

Browse Source
This commit is contained in:
Mikhail Kalinin 2021-06-15 14:55:06 +06:00
parent 2e87a6b44e
commit cc20b80103
4 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -532,7 +532,7 @@ class NoopExecutionEngine(ExecutionEngine):
def finalize_block(self, block_hash: Hash32) -> bool:
return True
def assemble_block(self, block_hash: Hash32, timestamp: uint64) -> ExecutionPayload:
def assemble_block(self, block_hash: Hash32, timestamp: uint64, randao: Bytes32) -> ExecutionPayload:
raise NotImplementedError("no default block production")

4
specs/merge/validator.md
View File

@ -95,9 +95,9 @@ def get_execution_payload(state: BeaconState,
return ExecutionPayload()
else:
# Signify merge via producing on top of the last PoW block
return produce_execution_payload(state, pow_block.block_hash, randao_reveal)
return produce_execution_payload(state, pow_block.block_hash, randao_reveal, execution_engine)
# Post-merge, normal payload
parent_hash = state.latest_execution_payload_header.block_hash
return produce_execution_payload(state, parent_hash, randao_reveal)
return produce_execution_payload(state, parent_hash, randao_reveal, execution_engine)
```

5
tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
View File

@ -1,3 +1,7 @@
def build_empty_execution_payload_with_randao(spec, state):
return build_empty_execution_payload(spec, state, spec.Bytes32())
def build_empty_execution_payload(spec, state, randao_mix):
"""
Assuming a pre-state of the same slot, build a valid ExecutionPayload without any transactions.
@ -25,6 +29,7 @@ def build_empty_execution_payload(spec, state, randao_mix):
return payload
def get_execution_payload_header(spec, execution_payload):
return spec.ExecutionPayloadHeader(
block_hash=execution_payload.block_hash,

53
tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py
View File

@ -1,5 +1,5 @@
from eth2spec.test.helpers.execution_payload import (
build_empty_execution_payload,
build_empty_execution_payload_with_randao,
get_execution_payload_header,
build_state_with_incomplete_transition,
build_state_with_complete_transition,
@ -7,7 +7,8 @@ from eth2spec.test.helpers.execution_payload import (
from eth2spec.test.context import spec_state_test, expect_assertion_error, with_merge_and_later
from eth2spec.test.helpers.state import next_slot
def run_execution_payload_processing(spec, state, execution_payload, randao_mix, valid=True, execution_valid=True):
def run_execution_payload_processing(spec, state, execution_payload, valid=True, execution_valid=True):
"""
Run ``process_execution_payload``, yielding:
- pre-state ('pre')
@ -21,6 +22,7 @@ def run_execution_payload_processing(spec, state, execution_payload, randao_mix,
yield 'execution', {'execution_valid': execution_valid}
yield 'execution_payload', execution_payload
randao_mix = spec.Bytes32()
called_new_block = False
class TestEngine(spec.NoopExecutionEngine):
@ -31,7 +33,8 @@ def run_execution_payload_processing(spec, state, execution_payload, randao_mix,
return execution_valid
if not valid:
expect_assertion_error(lambda: spec.process_execution_payload(state, execution_payload, randao_mix, TestEngine()))
expect_assertion_error(
lambda: spec.process_execution_payload(state, execution_payload, randao_mix, TestEngine()))
yield 'post', None
return
@ -53,9 +56,9 @@ def test_success_first_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32())
yield from run_execution_payload_processing(spec, state, execution_payload)
@with_merge_and_later
@ -66,9 +69,9 @@ def test_success_regular_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32())
yield from run_execution_payload_processing(spec, state, execution_payload)
@with_merge_and_later
@ -80,9 +83,9 @@ def test_success_first_payload_with_gap_slot(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32())
yield from run_execution_payload_processing(spec, state, execution_payload)
@with_merge_and_later
@ -94,9 +97,9 @@ def test_success_regular_payload_with_gap_slot(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32())
yield from run_execution_payload_processing(spec, state, execution_payload)
@with_merge_and_later
@ -109,9 +112,9 @@ def test_bad_execution_first_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32(), valid=False, execution_valid=False)
yield from run_execution_payload_processing(spec, state, execution_payload, valid=False, execution_valid=False)
@with_merge_and_later
@ -124,9 +127,9 @@ def test_bad_execution_regular_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32(), valid=False, execution_valid=False)
yield from run_execution_payload_processing(spec, state, execution_payload, valid=False, execution_valid=False)
@with_merge_and_later
@ -137,10 +140,10 @@ def test_bad_parent_hash_regular_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
execution_payload.parent_hash = spec.Hash32()
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32(), valid=False)
yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
@with_merge_and_later
@ -151,10 +154,10 @@ def test_bad_number_regular_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
execution_payload.number = execution_payload.number + 1
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32(), valid=False)
yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
@with_merge_and_later
@ -165,11 +168,11 @@ def test_bad_everything_regular_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
execution_payload.parent_hash = spec.Hash32()
execution_payload.number = execution_payload.number + 1
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32(), valid=False)
yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
@with_merge_and_later
@ -180,10 +183,10 @@ def test_bad_timestamp_first_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
execution_payload.timestamp = execution_payload.timestamp + 1
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32(), valid=False)
yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
@with_merge_and_later
@ -194,7 +197,7 @@ def test_bad_timestamp_regular_payload(spec, state):
next_slot(spec, state)
# execution payload
execution_payload = build_empty_execution_payload(spec, state, spec.Bytes32())
execution_payload = build_empty_execution_payload_with_randao(spec, state)
execution_payload.timestamp = execution_payload.timestamp + 1
yield from run_execution_payload_processing(spec, state, execution_payload, spec.Bytes32(), valid=False)
yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)