Clean up some FIXMEs

eth2/types/src/eth_spec.rs

@@ -108,7 +108,7 @@ pub trait EthSpec: 'static + Default + Sync + Send + Clone + Debug + PartialEq {
     ///
     /// Spec v0.9.1
     fn slots_per_eth1_voting_period() -> usize {
-        Self::EpochsPerHistoricalVector::to_usize()
+        Self::SlotsPerEth1VotingPeriod::to_usize()
     }
 }
 

eth2/types/src/test_utils/builders/testing_attestation_data_builder.rs

@@ -48,8 +48,8 @@ impl TestingAttestationDataBuilder {
         let beacon_block_root = *state.get_block_root(slot).unwrap();
 
         match test_task {
-            // FIXME(sproul)
-            AttestationTestTask::NoCommiteeForShard => index += 2,
+            // FIXME: re-enable the shard-like tests
+            // AttestationTestTask::NoCommiteeForShard => index += 2,
             // AttestationTestTask::BadShard => index = T::ShardCount::to_u64(),
             AttestationTestTask::IncludedTooEarly => {
                 slot = state.slot - spec.min_attestation_inclusion_delay + 1

eth2/types/src/test_utils/builders/testing_pending_attestation_builder.rs

@@ -13,7 +13,7 @@ impl<T: EthSpec> TestingPendingAttestationBuilder<T> {
     ///
     /// The `inclusion_delay` will be set to `MIN_ATTESTATION_INCLUSION_DELAY`.
     ///
-    /// * The aggregation and custody bitfields will all be empty, they need to be set with
+    /// * The aggregation bitfield will be empty, it needs to be set with
     /// `Self::add_committee_participation`.
     pub fn new(
         test_task: AttestationTestTask,