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 tests

This commit is contained in:
Danny Ryan 2019-03-26 07:38:51 -06:00
parent c5f1db27f5
commit 5a708bae34
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/phase0/helpers.py
View File

@ -12,7 +12,6 @@ from build.phase0.spec import (
AttestationData, AttestationData,
BeaconBlockHeader, BeaconBlockHeader,
Deposit, Deposit,
DepositInput,
DepositData, DepositData,
Eth1Data, Eth1Data,
ProposerSlashing, ProposerSlashing,
@ -43,21 +42,17 @@ pubkey_to_privkey = {pubkey: privkey for privkey, pubkey in zip(privkeys, pubkey
def create_mock_genesis_validator_deposits(num_validators, deposit_data_leaves=None): def create_mock_genesis_validator_deposits(num_validators, deposit_data_leaves=None):
if not deposit_data_leaves: if not deposit_data_leaves:
deposit_data_leaves = [] deposit_data_leaves = []
deposit_timestamp = 0
proof_of_possession = b'\x33' * 96 proof_of_possession = b'\x33' * 96
deposit_data_list = [] deposit_data_list = []
for i in range(num_validators): for i in range(num_validators):
pubkey = pubkeys[i] pubkey = pubkeys[i]
deposit_data = DepositData( deposit_data = DepositData(
pubkey=pubkey,
# insecurely use pubkey as withdrawal key as well
withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:],
amount=spec.MAX_DEPOSIT_AMOUNT, amount=spec.MAX_DEPOSIT_AMOUNT,
timestamp=deposit_timestamp, proof_of_possession=proof_of_possession,
deposit_input=DepositInput(
pubkey=pubkey,
# insecurely use pubkey as withdrawal key as well
withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:],
proof_of_possession=proof_of_possession,
),
) )
item = hash(deposit_data.serialize()) item = hash(deposit_data.serialize())
deposit_data_leaves.append(item) deposit_data_leaves.append(item)
@ -72,7 +67,7 @@ def create_mock_genesis_validator_deposits(num_validators, deposit_data_leaves=N
genesis_validator_deposits.append(Deposit( genesis_validator_deposits.append(Deposit(
proof=list(get_merkle_proof(tree, item_index=i)), proof=list(get_merkle_proof(tree, item_index=i)),
index=i, index=i,
deposit_data=deposit_data_list[i] data=deposit_data_list[i]
)) ))
return genesis_validator_deposits, root return genesis_validator_deposits, root
@ -112,14 +107,15 @@ def build_empty_block_for_next_slot(state):
def build_deposit_data(state, pubkey, privkey, amount): def build_deposit_data(state, pubkey, privkey, amount):
deposit_input = DepositInput( deposit_data = DepositData(
pubkey=pubkey, pubkey=pubkey,
# insecurely use pubkey as withdrawal key as well # insecurely use pubkey as withdrawal key as well
withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:], withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:],
amount=amount,
proof_of_possession=EMPTY_SIGNATURE, proof_of_possession=EMPTY_SIGNATURE,
) )
proof_of_possession = bls.sign( proof_of_possession = bls.sign(
message_hash=signed_root(deposit_input), message_hash=signed_root(deposit_data),
privkey=privkey, privkey=privkey,
domain=get_domain( domain=get_domain(
state.fork, state.fork,
@ -127,12 +123,7 @@ def build_deposit_data(state, pubkey, privkey, amount):
spec.DOMAIN_DEPOSIT, spec.DOMAIN_DEPOSIT,
) )
) )
deposit_input.proof_of_possession = proof_of_possession deposit_data.proof_of_possession = proof_of_possession
deposit_data = DepositData(
amount=amount,
timestamp=0,
deposit_input=deposit_input,
)
return deposit_data return deposit_data
@ -201,7 +192,7 @@ def build_deposit(state,
deposit = Deposit( deposit = Deposit(
proof=list(proof), proof=list(proof),
index=index, index=index,
deposit_data=deposit_data, data=deposit_data,
) )
return deposit, root, deposit_data_leaves return deposit, root, deposit_data_leaves

4
tests/phase0/test_sanity.py
View File

@ -163,7 +163,7 @@ def test_deposit_in_block(state):
deposit = Deposit( deposit = Deposit(
proof=list(proof), proof=list(proof),
index=index, index=index,
deposit_data=deposit_data, data=deposit_data,
) )
pre_state.latest_eth1_data.deposit_root = root pre_state.latest_eth1_data.deposit_root = root
@ -202,7 +202,7 @@ def test_deposit_top_up(state):
deposit = Deposit( deposit = Deposit(
proof=list(proof), proof=list(proof),
index=merkle_index, index=merkle_index,
deposit_data=deposit_data, data=deposit_data,
) )
pre_state.latest_eth1_data.deposit_root = root pre_state.latest_eth1_data.deposit_root = root