fix tests for get_domain PR

This commit is contained in:
Danny Ryan 2019-04-03 11:22:14 +11:00
parent 2f1ab491f9
commit dd520c6162
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
2 changed files with 14 additions and 18 deletions

View File

@ -50,7 +50,7 @@ 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 = []
proof_of_possession = b'\x33' * 96 signature = b'\x33' * 96
deposit_data_list = [] deposit_data_list = []
for i in range(num_validators): for i in range(num_validators):
@ -60,7 +60,7 @@ def create_mock_genesis_validator_deposits(num_validators, deposit_data_leaves=N
# 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=spec.MAX_DEPOSIT_AMOUNT, amount=spec.MAX_DEPOSIT_AMOUNT,
proof_of_possession=proof_of_possession, signature=signature,
) )
item = hash(deposit_data.serialize()) item = hash(deposit_data.serialize())
deposit_data_leaves.append(item) deposit_data_leaves.append(item)
@ -120,18 +120,17 @@ def build_deposit_data(state, pubkey, privkey, amount):
# 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, amount=amount,
proof_of_possession=EMPTY_SIGNATURE, signature=EMPTY_SIGNATURE,
) )
proof_of_possession = bls.sign( signature = bls.sign(
message_hash=signed_root(deposit_data), message_hash=signed_root(deposit_data),
privkey=privkey, privkey=privkey,
domain=get_domain( domain=get_domain(
state.fork, state,
get_current_epoch(state),
spec.DOMAIN_DEPOSIT, spec.DOMAIN_DEPOSIT,
) )
) )
deposit_data.proof_of_possession = proof_of_possession deposit_data.signature = signature
return deposit_data return deposit_data
@ -173,9 +172,9 @@ def build_voluntary_exit(state, epoch, validator_index, privkey):
message_hash=signed_root(voluntary_exit), message_hash=signed_root(voluntary_exit),
privkey=privkey, privkey=privkey,
domain=get_domain( domain=get_domain(
fork=state.fork, state=state,
epoch=epoch,
domain_type=spec.DOMAIN_VOLUNTARY_EXIT, domain_type=spec.DOMAIN_VOLUNTARY_EXIT,
message_epoch=epoch,
) )
) )
@ -224,9 +223,8 @@ def get_valid_proposer_slashing(state):
header_2.slot = slot + 1 header_2.slot = slot + 1
domain = get_domain( domain = get_domain(
fork=state.fork, state=state,
epoch=get_current_epoch(state), domain_type=spec.DOMAIN_BEACON_PROPOSER,
domain_type=spec.DOMAIN_BEACON_BLOCK,
) )
header_1.signature = bls.sign( header_1.signature = bls.sign(
message_hash=signed_root(header_1), message_hash=signed_root(header_1),
@ -307,8 +305,8 @@ def get_attestation_signature(state, attestation_data, privkey, custody_bit=0b0)
message_hash=message_hash, message_hash=message_hash,
privkey=privkey, privkey=privkey,
domain=get_domain( domain=get_domain(
fork=state.fork, state=state,
epoch=slot_to_epoch(attestation_data.slot),
domain_type=spec.DOMAIN_ATTESTATION, domain_type=spec.DOMAIN_ATTESTATION,
message_epoch=slot_to_epoch(attestation_data.slot),
) )
) )

View File

@ -303,8 +303,7 @@ def test_voluntary_exit(state):
message_hash=signed_root(voluntary_exit), message_hash=signed_root(voluntary_exit),
privkey=privkeys[validator_index], privkey=privkeys[validator_index],
domain=get_domain( domain=get_domain(
fork=pre_state.fork, state=pre_state,
epoch=get_current_epoch(pre_state),
domain_type=spec.DOMAIN_VOLUNTARY_EXIT, domain_type=spec.DOMAIN_VOLUNTARY_EXIT,
) )
) )
@ -390,8 +389,7 @@ def test_transfer(state):
message_hash=signed_root(transfer), message_hash=signed_root(transfer),
privkey=transfer_privkey, privkey=transfer_privkey,
domain=get_domain( domain=get_domain(
fork=pre_state.fork, state=pre_state,
epoch=get_current_epoch(pre_state),
domain_type=spec.DOMAIN_TRANSFER, domain_type=spec.DOMAIN_TRANSFER,
) )
) )