From 6560bc42d2fc877cddf044c0a993efde74ee7b72 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Thu, 1 Aug 2019 13:39:32 -0600 Subject: [PATCH] Apply suggestions from code review Co-Authored-By: Carl Beekhuizen --- specs/core/1_beacon-chain-misc.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/specs/core/1_beacon-chain-misc.md b/specs/core/1_beacon-chain-misc.md index f816c6259..d1ea48dba 100644 --- a/specs/core/1_beacon-chain-misc.md +++ b/specs/core/1_beacon-chain-misc.md @@ -30,9 +30,9 @@ ```python class ShardReceiptProof(Container): - shard: Shard - proof: List[Hash, PLACEHOLDER] - receipt: List[ShardReceiptDelta, PLACEHOLDER] + shard: Shard + proof: List[Hash, PLACEHOLDER] + receipt: List[ShardReceiptDelta, PLACEHOLDER] ``` ## Helpers @@ -107,9 +107,9 @@ def compute_historical_state_generalized_index(earlier: ShardSlot, later: ShardS """ o = GeneralizedIndex(1) for i in range(63, -1, -1): - if (later-1) & 2**i > (earlier-1) & 2**i: - later = later - ((later-1) % 2**i) - 1 - o = concat_generalized_indices(o, get_generalized_index(ShardState, 'history_acc', i)) + if (later - 1) & 2**i > (earlier - 1) & 2**i: + later = later - ((later - 1) % 2**i) - 1 + o = concat_generalized_indices(o, get_generalized_index(ShardState, 'history_acc', i)) return o ``` @@ -136,8 +136,8 @@ def process_shard_receipt(state: BeaconState, receipt_proof: ShardReceiptProof): first_slot_in_last_crosslink = state.current_crosslinks[receipt_proof.shard].start_epoch * SLOTS_PER_EPOCH gindex = concat_generalized_indices( get_generalized_index_of_crosslink_header(0), - get_generalized_index(ShardBlockHeader, 'state_root') - compute_historical_state_generalized_index(receipt_slot, first_slot_in_last_crosslink) + get_generalized_index(ShardBlockHeader, 'state_root'), + compute_historical_state_generalized_index(receipt_slot, first_slot_in_last_crosslink), get_generalized_index(ShardState, 'receipt_root') ) assert verify_merkle_proof(