From a71c0a5ccc4c74f5ae8c3c071aa47506aa5cc03a Mon Sep 17 00:00:00 2001
From: Hsiao-Wei Wang <hwwang156@gmail.com>
Date: Sat, 6 Jun 2020 02:35:46 +0800
Subject: [PATCH] Per #1704 discussion, remove `on_time_slot`: the given
 `beacon_state` should be transitioned.

---
 specs/phase1/shard-transition.md                           | 4 ++--
 tests/core/pyspec/eth2spec/test/helpers/attestations.py    | 6 ++----
 tests/core/pyspec/eth2spec/test/helpers/shard_block.py     | 2 +-
 .../core/pyspec/eth2spec/test/helpers/shard_transitions.py | 7 ++-----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/specs/phase1/shard-transition.md b/specs/phase1/shard-transition.md
index 8d75879f5..191dbd1aa 100644
--- a/specs/phase1/shard-transition.md
+++ b/specs/phase1/shard-transition.md
@@ -280,8 +280,8 @@ Suppose you are a committee member on shard `shard` at slot `current_slot` and y
 ```python
 def get_shard_transition(beacon_state: BeaconState,
                          shard: Shard,
-                         shard_blocks: Sequence[SignedShardBlock],
-                         on_time_slot: Slot) -> ShardTransition:
+                         shard_blocks: Sequence[SignedShardBlock]) -> ShardTransition:
+    on_time_slot = Slot(beacon_state.slot + 1)
     offset_slots = compute_offset_slots(get_latest_slot_for_shard(beacon_state, shard), on_time_slot)
     proposals, shard_states, shard_data_roots = get_shard_state_transition_result(
         beacon_state, shard, shard_blocks, on_time_slot
diff --git a/tests/core/pyspec/eth2spec/test/helpers/attestations.py b/tests/core/pyspec/eth2spec/test/helpers/attestations.py
index ef90a71aa..1e0560405 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/attestations.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/attestations.py
@@ -85,7 +85,7 @@ def build_attestation_data(spec, state, slot, index, shard_transition=None, on_t
             # No shard transition -> no shard block
             shard = spec.get_shard(state, spec.Attestation(data=attestation_data))
             if on_time:
-                shard_transition = spec.get_shard_transition(state, shard, shard_blocks=[], on_time_slot=slot + 1)
+                shard_transition = spec.get_shard_transition(state, shard, shard_blocks=[])
                 lastest_shard_data_root_index = len(shard_transition.shard_data_roots) - 1
                 attestation_data.shard_head_root = shard_transition.shard_data_roots[lastest_shard_data_root_index]
                 attestation_data.shard_transition_root = shard_transition.hash_tree_root()
@@ -318,9 +318,7 @@ def next_epoch_with_attestations(spec,
                 for index in range(committees_per_slot):
                     if spec.fork == PHASE1:
                         shard = spec.compute_shard_from_committee_index(post_state, index, slot_to_attest)
-                        shard_transition = get_shard_transition_of_committee(
-                            spec, post_state, index, slot=slot_to_attest
-                        )
+                        shard_transition = get_shard_transition_of_committee(spec, post_state, index)
                         block.body.shard_transitions[shard] = shard_transition
                     else:
                         shard_transition = None
diff --git a/tests/core/pyspec/eth2spec/test/helpers/shard_block.py b/tests/core/pyspec/eth2spec/test/helpers/shard_block.py
index 0a2ed67d2..e63096b92 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/shard_block.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/shard_block.py
@@ -61,7 +61,7 @@ def build_shard_transitions_till_slot(spec, parent_beacon_state, shard_blocks):
             on_time_slot,
         )
         len_offset_slots = len(offset_slots)
-        shard_transition = spec.get_shard_transition(parent_beacon_state, shard, blocks, on_time_slot)
+        shard_transition = spec.get_shard_transition(parent_beacon_state, shard, blocks)
 
         if len(blocks) > 0:
             shard_block_root = blocks[-1].message.hash_tree_root()
diff --git a/tests/core/pyspec/eth2spec/test/helpers/shard_transitions.py b/tests/core/pyspec/eth2spec/test/helpers/shard_transitions.py
index 8e62b2f27..d10d1ee7b 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/shard_transitions.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/shard_transitions.py
@@ -28,13 +28,10 @@ def run_shard_transitions_processing(spec, state, shard_transitions, attestation
     yield 'post', state
 
 
-def get_shard_transition_of_committee(spec, state, committee_index, slot=None, shard_blocks=None):
+def get_shard_transition_of_committee(spec, state, committee_index, shard_blocks=None):
     if shard_blocks is None:
         shard_blocks = []
 
-    if slot is None:
-        slot = state.slot
-
     shard = spec.compute_shard_from_committee_index(state, committee_index, state.slot)
-    shard_transition = spec.get_shard_transition(state, shard, shard_blocks=shard_blocks, on_time_slot=slot + 1)
+    shard_transition = spec.get_shard_transition(state, shard, shard_blocks=shard_blocks)
     return shard_transition