status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-02-20 06:18:15 +00:00
Code Issues Projects Releases Wiki Activity

remove unnecessary (and now outdated) type hints, update List encoding for generators

Browse Source
This commit is contained in:
protolambda 2019-06-22 19:48:06 +02:00
parent f95e7315b4
commit dd5ad2e2c5
No known key found for this signature in database
GPG Key ID: EC89FDBB2B4C7623
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_libs/pyspec/eth2spec/debug/encode.py
View File

@ -13,9 +13,9 @@ def encode(value: SSZValue, include_hash_tree_roots=False):
elif isinstance(value, Bit): elif isinstance(value, Bit):
assert value in (True, False) assert value in (True, False)
return value return value
elif isinstance(value, (List, Vector)): elif isinstance(value, list): # normal python lists, ssz-List, Vector
return [encode(element, include_hash_tree_roots) for element in value] return [encode(element, include_hash_tree_roots) for element in value]
elif isinstance(value, (Bytes, BytesN)): # both bytes and BytesN elif isinstance(value, bytes): # both bytes and BytesN
return '0x' + value.hex() return '0x' + value.hex()
elif isinstance(value, Container): elif isinstance(value, Container):
ret = {} ret = {}

1
test_libs/pyspec/eth2spec/test/helpers/genesis.py
View File

@ -1,5 +1,6 @@
from eth2spec.test.helpers.keys import pubkeys from eth2spec.test.helpers.keys import pubkeys
from eth2spec.utils.ssz.ssz_impl import hash_tree_root from eth2spec.utils.ssz.ssz_impl import hash_tree_root
from eth2spec.utils.ssz.ssz_typing import List
def build_mock_validator(spec, i: int, balance: int): def build_mock_validator(spec, i: int, balance: int):

28
test_libs/pyspec/eth2spec/test/sanity/test_blocks.py
View File

@ -28,7 +28,7 @@ def test_empty_block_transition(spec, state):
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
assert len(state.eth1_data_votes) == pre_eth1_votes + 1 assert len(state.eth1_data_votes) == pre_eth1_votes + 1
@ -48,7 +48,7 @@ def test_skipped_slots(spec, state):
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
assert state.slot == block.slot assert state.slot == block.slot
@ -69,7 +69,7 @@ def test_empty_epoch_transition(spec, state):
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
assert state.slot == block.slot assert state.slot == block.slot
@ -90,7 +90,7 @@ def test_empty_epoch_transition(spec, state):
# state_transition_and_sign_block(spec, state, block) # state_transition_and_sign_block(spec, state, block)
# yield 'blocks', [block], List[spec.BeaconBlock] # yield 'blocks', [block]
# yield 'post', state # yield 'post', state
# assert state.slot == block.slot # assert state.slot == block.slot
@ -120,7 +120,7 @@ def test_proposer_slashing(spec, state):
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
# check if slashed # check if slashed
@ -155,7 +155,7 @@ def test_attester_slashing(spec, state):
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
slashed_validator = state.validators[validator_index] slashed_validator = state.validators[validator_index]
@ -193,7 +193,7 @@ def test_deposit_in_block(spec, state):
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
assert len(state.validators) == initial_registry_len + 1 assert len(state.validators) == initial_registry_len + 1
@ -221,7 +221,7 @@ def test_deposit_top_up(spec, state):
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
assert len(state.validators) == initial_registry_len assert len(state.validators) == initial_registry_len
@ -256,7 +256,7 @@ def test_attestation(spec, state):
sign_block(spec, state, epoch_block) sign_block(spec, state, epoch_block)
state_transition_and_sign_block(spec, state, epoch_block) state_transition_and_sign_block(spec, state, epoch_block)
yield 'blocks', [attestation_block, epoch_block], List[spec.BeaconBlock] yield 'blocks', [attestation_block, epoch_block]
yield 'post', state yield 'post', state
assert len(state.current_epoch_attestations) == 0 assert len(state.current_epoch_attestations) == 0
@ -303,7 +303,7 @@ def test_voluntary_exit(spec, state):
sign_block(spec, state, exit_block) sign_block(spec, state, exit_block)
state_transition_and_sign_block(spec, state, exit_block) state_transition_and_sign_block(spec, state, exit_block)
yield 'blocks', [initiate_exit_block, exit_block], List[spec.BeaconBlock] yield 'blocks', [initiate_exit_block, exit_block]
yield 'post', state yield 'post', state
assert state.validators[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH assert state.validators[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH
@ -334,7 +334,7 @@ def test_voluntary_exit(spec, state):
# state_transition_and_sign_block(spec, state, block) # state_transition_and_sign_block(spec, state, block)
# yield 'blocks', [block], List[spec.BeaconBlock] # yield 'blocks', [block]
# yield 'post', state # yield 'post', state
# sender_balance = get_balance(state, sender_index) # sender_balance = get_balance(state, sender_index)
@ -362,7 +362,7 @@ def test_balance_driven_status_transitions(spec, state):
sign_block(spec, state, block) sign_block(spec, state, block)
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
assert state.validators[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH assert state.validators[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH
@ -379,7 +379,7 @@ def test_historical_batch(spec, state):
block = build_empty_block_for_next_slot(spec, state, signed=True) block = build_empty_block_for_next_slot(spec, state, signed=True)
state_transition_and_sign_block(spec, state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block]
yield 'post', state yield 'post', state
assert state.slot == block.slot assert state.slot == block.slot
@ -408,7 +408,7 @@ def test_historical_batch(spec, state):
# state_transition_and_sign_block(spec, state, block) # state_transition_and_sign_block(spec, state, block)
# yield 'blocks', [block], List[spec.BeaconBlock] # yield 'blocks', [block]
# yield 'post', state # yield 'post', state
# assert state.slot % spec.SLOTS_PER_ETH1_VOTING_PERIOD == 0 # assert state.slot % spec.SLOTS_PER_ETH1_VOTING_PERIOD == 0

11
test_libs/pyspec/eth2spec/test/test_finality.py
View File

@ -1,5 +1,4 @@
from copy import deepcopy from copy import deepcopy
from typing import List
from eth2spec.test.context import spec_state_test, never_bls, with_all_phases from eth2spec.test.context import spec_state_test, never_bls, with_all_phases
from eth2spec.test.helpers.state import next_epoch, state_transition_and_sign_block from eth2spec.test.helpers.state import next_epoch, state_transition_and_sign_block
@ -82,7 +81,7 @@ def test_finality_no_updates_at_genesis(spec, state):
elif epoch == 1: elif epoch == 1:
check_finality(spec, state, prev_state, False, False, False) check_finality(spec, state, prev_state, False, False, False)
yield 'blocks', blocks, List[spec.BeaconBlock] yield 'blocks', blocks
yield 'post', state yield 'post', state
@ -111,7 +110,7 @@ def test_finality_rule_4(spec, state):
assert state.finalized_epoch == prev_state.current_justified_epoch assert state.finalized_epoch == prev_state.current_justified_epoch
assert state.finalized_root == prev_state.current_justified_root assert state.finalized_root == prev_state.current_justified_root
yield 'blocks', blocks, List[spec.BeaconBlock] yield 'blocks', blocks
yield 'post', state yield 'post', state
@ -142,7 +141,7 @@ def test_finality_rule_1(spec, state):
assert state.finalized_epoch == prev_state.previous_justified_epoch assert state.finalized_epoch == prev_state.previous_justified_epoch
assert state.finalized_root == prev_state.previous_justified_root assert state.finalized_root == prev_state.previous_justified_root
yield 'blocks', blocks, List[spec.BeaconBlock] yield 'blocks', blocks
yield 'post', state yield 'post', state
@ -175,7 +174,7 @@ def test_finality_rule_2(spec, state):
blocks += new_blocks blocks += new_blocks
yield 'blocks', blocks, List[spec.BeaconBlock] yield 'blocks', blocks
yield 'post', state yield 'post', state
@ -225,5 +224,5 @@ def test_finality_rule_3(spec, state):
assert state.finalized_epoch == prev_state.current_justified_epoch assert state.finalized_epoch == prev_state.current_justified_epoch
assert state.finalized_root == prev_state.current_justified_root assert state.finalized_root == prev_state.current_justified_root
yield 'blocks', blocks, List[spec.BeaconBlock] yield 'blocks', blocks
yield 'post', state yield 'post', state