From 476335574a32971616f93d06fc5be41265b7a267 Mon Sep 17 00:00:00 2001 From: NIC619 Date: Mon, 11 Mar 2019 18:59:49 +0800 Subject: [PATCH] Update rewards and penalties tests --- .../forks/test_serenity_epoch_processing.py | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/tests/eth2/beacon/state_machines/forks/test_serenity_epoch_processing.py b/tests/eth2/beacon/state_machines/forks/test_serenity_epoch_processing.py index 6bd3f2537b..1f2915d8cd 100644 --- a/tests/eth2/beacon/state_machines/forks/test_serenity_epoch_processing.py +++ b/tests/eth2/beacon/state_machines/forks/test_serenity_epoch_processing.py @@ -58,7 +58,6 @@ _compute_total_penalties, _current_previous_epochs_justifiable, _get_finalized_epoch, - _process_rewards_and_penalties_for_attestation_inclusion, _process_rewards_and_penalties_for_crosslinks, _process_rewards_and_penalties_for_finality, _update_latest_active_index_roots, @@ -599,11 +598,6 @@ def test_process_rewards_and_penalties_for_finality( for index in range(len(state.validator_registry)) } - rewards_received = { - index: 0 - for index in range(len(state.validator_registry)) - } - prev_epoch_start_slot = get_epoch_start_slot( state.previous_epoch(config.SLOTS_PER_EPOCH, config.GENESIS_EPOCH), slots_per_epoch, ) @@ -645,7 +639,7 @@ def test_process_rewards_and_penalties_for_finality( previous_epoch_attestations=prev_epoch_attestations, ) - rewards_received = _process_rewards_and_penalties_for_finality( + rewards_received, penalties_received = _process_rewards_and_penalties_for_finality( state, config, previous_epoch_active_validator_indices, @@ -655,11 +649,12 @@ def test_process_rewards_and_penalties_for_finality( inclusion_infos, effective_balances, base_rewards, - rewards_received, ) - for index, reward_received in rewards_received.items(): - assert reward_received == expected_rewards_received[index] + for index in range(len(state.validator_registry)): + assert ( + rewards_received[index] - penalties_received[index] == expected_rewards_received[index] + ) @settings(max_examples=1) @@ -788,17 +783,11 @@ def test_process_rewards_and_penalties_for_crosslinks( for index in active_validators } - rewards_received = { - index: 0 - for index in range(len(state.validator_registry)) - } - - rewards_received = _process_rewards_and_penalties_for_crosslinks( + rewards_received, penalties_received = _process_rewards_and_penalties_for_crosslinks( state, config, effective_balances, base_rewards, - rewards_received, ) expected_rewards_received = { @@ -831,8 +820,10 @@ def test_process_rewards_and_penalties_for_crosslinks( expected_rewards_received[index] -= penalty # Check the rewards/penalties match - for index, reward_received in rewards_received.items(): - assert rewards_received[index] == expected_rewards_received[index] + for index in range(len(state.validator_registry)): + assert ( + rewards_received[index] - penalties_received[index] == expected_rewards_received[index] + ) #