Fix tests

test_libs/pyspec/tests/block_processing/test_process_attestation.py

@@ -113,7 +113,7 @@ def test_non_zero_crosslink_data_root(state):
     attestation = get_valid_attestation(state)
     state.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
 
-    attestation.data.crosslink_data_root = b'\x42' * 32
+    attestation.data.crosslink.crosslink_data_root = b'\x42' * 32
 
     pre_state, post_state = run_attestation_processing(state, attestation, False)
 
@@ -126,7 +126,7 @@ def test_bad_previous_crosslink(state):
     for _ in range(spec.MIN_ATTESTATION_INCLUSION_DELAY):
         next_slot(state)
 
-    state.current_crosslinks[attestation.data.shard].epoch += 10
+    state.current_crosslinks[attestation.data.crosslink.shard].epoch += 10
 
     pre_state, post_state = run_attestation_processing(state, attestation, False)
 

test_libs/pyspec/tests/epoch_processing/test_process_crosslinks.py

@@ -64,7 +64,7 @@ def test_single_crosslink_update_from_current_epoch(state):
 
     pre_state, post_state = run_process_crosslinks(state)
 
-    shard = attestation.data.shard
+    shard = attestation.data.crosslink.shard
     assert post_state.previous_crosslinks[shard] != post_state.current_crosslinks[shard]
     assert pre_state.current_crosslinks[shard] != post_state.current_crosslinks[shard]
 
@@ -84,11 +84,11 @@ def test_single_crosslink_update_from_previous_epoch(state):
     pre_state, post_state = run_process_crosslinks(state)
     crosslink_deltas = get_crosslink_deltas(state)
 
-    shard = attestation.data.shard
+    shard = attestation.data.crosslink.shard
     assert post_state.previous_crosslinks[shard] != post_state.current_crosslinks[shard]
     assert pre_state.current_crosslinks[shard] != post_state.current_crosslinks[shard]
     # ensure rewarded
-    for index in get_crosslink_committee(state, attestation.data.target_epoch, attestation.data.shard):
+    for index in get_crosslink_committee(state, attestation.data.target_epoch, attestation.data.crosslink.shard):
         assert crosslink_deltas[0][index] > 0
         assert crosslink_deltas[1][index] == 0
 
@@ -108,7 +108,7 @@ def test_double_late_crosslink(state):
 
     for slot in range(spec.SLOTS_PER_EPOCH):
         attestation_2 = get_valid_attestation(state)
-        if attestation_2.data.shard == attestation_1.data.shard:
+        if attestation_2.data.crosslink.shard == attestation_1.data.crosslink.shard:
             break
         next_slot(state)
     fill_aggregate_attestation(state, attestation_2)
@@ -124,12 +124,12 @@ def test_double_late_crosslink(state):
     pre_state, post_state = run_process_crosslinks(state)
     crosslink_deltas = get_crosslink_deltas(state)
 
-    shard = attestation_2.data.shard
+    shard = attestation_2.data.crosslink.shard
 
     # ensure that the current crosslinks were not updated by the second attestation
     assert post_state.previous_crosslinks[shard] == post_state.current_crosslinks[shard]
     # ensure no reward, only penalties for the failed crosslink
-    for index in get_crosslink_committee(state, attestation_2.data.target_epoch, attestation_2.data.shard):
+    for index in get_crosslink_committee(state, attestation_2.data.target_epoch, attestation_2.data.crosslink.shard):
         assert crosslink_deltas[0][index] == 0
         assert crosslink_deltas[1][index] > 0
 

test_libs/pyspec/tests/helpers.py

@@ -10,6 +10,7 @@ from eth2spec.utils.minimal_ssz import signing_root
 from eth2spec.phase0.spec import (
     # constants
     ZERO_HASH,
+    MAX_EPOCHS_PER_CROSSLINK,
     # SSZ
     Attestation,
     AttestationData,
@@ -17,6 +18,7 @@ from eth2spec.phase0.spec import (
     AttesterSlashing,
     BeaconBlock,
     BeaconBlockHeader,
+    Crosslink,
     Deposit,
     DepositData,
     Eth1Data,
@@ -174,14 +176,17 @@ def build_attestation_data(state, slot, shard):
 
     crosslinks = state.current_crosslinks if slot_to_epoch(slot) == get_current_epoch(state) else state.previous_crosslinks
     return AttestationData(
-        shard=shard,
         beacon_block_root=block_root,
         source_epoch=justified_epoch,
         source_root=justified_block_root,
         target_epoch=slot_to_epoch(slot),
         target_root=epoch_boundary_root,
-        crosslink_data_root=spec.ZERO_HASH,
-        previous_crosslink_root=hash_tree_root(crosslinks[shard]),
+        crosslink=Crosslink(
+            shard=shard,
+            epoch=min(slot_to_epoch(slot), crosslinks[shard].epoch + MAX_EPOCHS_PER_CROSSLINK),
+            crosslink_data_root=spec.ZERO_HASH,
+            previous_crosslink_root=hash_tree_root(crosslinks[shard]),
+        ),
     )
 
 
@@ -288,7 +293,7 @@ def get_valid_attestation(state, slot=None):
 
     attestation_data = build_attestation_data(state, slot, shard)
 
-    crosslink_committee = get_crosslink_committee(state, attestation_data.target_epoch, attestation_data.shard)
+    crosslink_committee = get_crosslink_committee(state, attestation_data.target_epoch, attestation_data.crosslink.shard)
 
     committee_size = len(crosslink_committee)
     bitfield_length = (committee_size + 7) // 8
@@ -381,7 +386,7 @@ def get_attestation_signature(state, attestation_data, privkey, custody_bit=0b0)
 
 
 def fill_aggregate_attestation(state, attestation):
-    crosslink_committee = get_crosslink_committee(state, attestation.data.target_epoch, attestation.data.shard)
+    crosslink_committee = get_crosslink_committee(state, attestation.data.target_epoch, attestation.data.crosslink.shard)
     for i in range(len(crosslink_committee)):
         attestation.aggregation_bitfield = set_bitfield_bit(attestation.aggregation_bitfield, i)