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

fix mixed up formats. Output slots as ints, output genesis eth1 init data as yaml dict

This commit is contained in:
protolambda 2021-03-22 02:50:05 +01:00
parent a69ad6c2db
commit 4dd855667a
No known key found for this signature in database
GPG Key ID: EC89FDBB2B4C7623
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/core/pyspec/eth2spec/test/phase0/genesis/test_initialization.py
View File

@ -16,6 +16,13 @@ def get_post_altair_description(spec):
return f"Although it's not phase 0, we may use {spec.fork} spec to start testnets." return f"Although it's not phase 0, we may use {spec.fork} spec to start testnets."
def eth1_init_data(eth1_block_hash, eth1_timestamp):
yield 'eth1', {
'eth1_block_hash': '0x' + eth1_block_hash.hex(),
'eth1_timestamp': int(eth1_timestamp),
}
@with_all_phases @with_all_phases
@spec_test @spec_test
@single_phase @single_phase
@ -35,8 +42,7 @@ def test_initialize_beacon_state_from_eth1(spec):
eth1_block_hash = b'\x12' * 32 eth1_block_hash = b'\x12' * 32
eth1_timestamp = spec.MIN_GENESIS_TIME eth1_timestamp = spec.MIN_GENESIS_TIME
yield 'eth1_block_hash', eth1_block_hash yield from eth1_init_data(eth1_block_hash, eth1_timestamp)
yield 'eth1_timestamp', eth1_timestamp
yield 'deposits', deposits yield 'deposits', deposits
# initialize beacon_state # initialize beacon_state
@ -79,8 +85,7 @@ def test_initialize_beacon_state_some_small_balances(spec):
eth1_block_hash = b'\x12' * 32 eth1_block_hash = b'\x12' * 32
eth1_timestamp = spec.MIN_GENESIS_TIME eth1_timestamp = spec.MIN_GENESIS_TIME
yield 'eth1_block_hash', eth1_block_hash yield from eth1_init_data(eth1_block_hash, eth1_timestamp)
yield 'eth1_timestamp', eth1_timestamp
yield 'deposits', deposits yield 'deposits', deposits
# initialize beacon_state # initialize beacon_state
@ -136,8 +141,7 @@ def test_initialize_beacon_state_one_topup_activation(spec):
eth1_block_hash = b'\x13' * 32 eth1_block_hash = b'\x13' * 32
eth1_timestamp = spec.MIN_GENESIS_TIME eth1_timestamp = spec.MIN_GENESIS_TIME
yield 'eth1_block_hash', eth1_block_hash yield from eth1_init_data(eth1_block_hash, eth1_timestamp)
yield 'eth1_timestamp', eth1_timestamp
yield 'deposits', deposits yield 'deposits', deposits
# initialize beacon_state # initialize beacon_state
@ -165,8 +169,7 @@ def test_initialize_beacon_state_random_invalid_genesis(spec):
eth1_block_hash = b'\x14' * 32 eth1_block_hash = b'\x14' * 32
eth1_timestamp = spec.MIN_GENESIS_TIME + 1 eth1_timestamp = spec.MIN_GENESIS_TIME + 1
yield 'eth1_block_hash', eth1_block_hash yield from eth1_init_data(eth1_block_hash, eth1_timestamp)
yield 'eth1_timestamp', eth1_timestamp
yield 'deposits', deposits yield 'deposits', deposits
# initialize beacon_state # initialize beacon_state
@ -205,8 +208,7 @@ def test_initialize_beacon_state_random_valid_genesis(spec):
eth1_block_hash = b'\x15' * 32 eth1_block_hash = b'\x15' * 32
eth1_timestamp = spec.MIN_GENESIS_TIME + 2 eth1_timestamp = spec.MIN_GENESIS_TIME + 2
yield 'eth1_block_hash', eth1_block_hash yield from eth1_init_data(eth1_block_hash, eth1_timestamp)
yield 'eth1_timestamp', eth1_timestamp
yield 'deposits', deposits yield 'deposits', deposits
# initialize beacon_state # initialize beacon_state

10
tests/core/pyspec/eth2spec/test/phase0/sanity/test_slots.py
View File

@ -10,7 +10,7 @@ def test_slots_1(spec, state):
yield 'pre', state yield 'pre', state
slots = 1 slots = 1
yield 'slots', slots yield 'slots', int(slots)
spec.process_slots(state, state.slot + slots) spec.process_slots(state, state.slot + slots)
yield 'post', state yield 'post', state
@ -23,7 +23,7 @@ def test_slots_1(spec, state):
def test_slots_2(spec, state): def test_slots_2(spec, state):
yield 'pre', state yield 'pre', state
slots = 2 slots = 2
yield 'slots', slots yield 'slots', int(slots)
spec.process_slots(state, state.slot + slots) spec.process_slots(state, state.slot + slots)
yield 'post', state yield 'post', state
@ -33,7 +33,7 @@ def test_slots_2(spec, state):
def test_empty_epoch(spec, state): def test_empty_epoch(spec, state):
yield 'pre', state yield 'pre', state
slots = spec.SLOTS_PER_EPOCH slots = spec.SLOTS_PER_EPOCH
yield 'slots', slots yield 'slots', int(slots)
spec.process_slots(state, state.slot + slots) spec.process_slots(state, state.slot + slots)
yield 'post', state yield 'post', state
@ -43,7 +43,7 @@ def test_empty_epoch(spec, state):
def test_double_empty_epoch(spec, state): def test_double_empty_epoch(spec, state):
yield 'pre', state yield 'pre', state
slots = spec.SLOTS_PER_EPOCH * 2 slots = spec.SLOTS_PER_EPOCH * 2
yield 'slots', slots yield 'slots', int(slots)
spec.process_slots(state, state.slot + slots) spec.process_slots(state, state.slot + slots)
yield 'post', state yield 'post', state
@ -55,6 +55,6 @@ def test_over_epoch_boundary(spec, state):
spec.process_slots(state, state.slot + (spec.SLOTS_PER_EPOCH // 2)) spec.process_slots(state, state.slot + (spec.SLOTS_PER_EPOCH // 2))
yield 'pre', state yield 'pre', state
slots = spec.SLOTS_PER_EPOCH slots = spec.SLOTS_PER_EPOCH
yield 'slots', slots yield 'slots', int(slots)
spec.process_slots(state, state.slot + slots) spec.process_slots(state, state.slot + slots)
yield 'post', state yield 'post', state

10
tests/formats/genesis/initialization.md
View File

@ -4,13 +4,13 @@ Tests the initialization of a genesis state based on Eth1 data.
## Test case format ## Test case format
### `eth1_block_hash.ssz_snappy` ### `eth1.yaml`
An SSZ-snappy encoded root of the Eth1 block. ```yaml
eth1_block_hash: Bytes32 -- A `Bytes32` hex encoded, with prefix 0x. The root of the Eth1 block. E.g. "0x4242424242424242424242424242424242424242424242424242424242424242"
eth1_timestamp: int -- An integer. The timestamp of the block, in seconds.
```
### `eth1_timestamp.yaml`
An integer. The timestamp of the block, in seconds.
### `meta.yaml` ### `meta.yaml`