Do project-wide s/epoch_length/slots_per_epoch/g

validator_client/src/duties/epoch_duties.rs

@@ -32,14 +32,14 @@ pub enum EpochDutiesMapError {
 
 /// Maps an `epoch` to some `EpochDuties` for a single validator.
 pub struct EpochDutiesMap {
-    pub epoch_length: u64,
+    pub slots_per_epoch: u64,
     pub map: RwLock<HashMap<Epoch, EpochDuties>>,
 }
 
 impl EpochDutiesMap {
-    pub fn new(epoch_length: u64) -> Self {
+    pub fn new(slots_per_epoch: u64) -> Self {
         Self {
-            epoch_length,
+            slots_per_epoch,
             map: RwLock::new(HashMap::new()),
         }
     }
@@ -67,7 +67,7 @@ impl EpochDutiesMap {
 
 impl DutiesReader for EpochDutiesMap {
     fn is_block_production_slot(&self, slot: Slot) -> Result<bool, DutiesReaderError> {
-        let epoch = slot.epoch(self.epoch_length);
+        let epoch = slot.epoch(self.slots_per_epoch);
 
         let map = self.map.read().map_err(|_| DutiesReaderError::Poisoned)?;
         let duties = map

validator_client/src/duties/mod.rs

@@ -61,7 +61,7 @@ impl<T: SlotClock, U: BeaconNode> DutiesManager<T, U> {
             .map_err(|_| Error::SlotClockError)?
             .ok_or(Error::SlotUnknowable)?;
 
-        let epoch = slot.epoch(self.spec.epoch_length);
+        let epoch = slot.epoch(self.spec.slots_per_epoch);
 
         if let Some(duties) = self.beacon_node.request_shuffling(epoch, &self.pubkey)? {
             // If these duties were known, check to see if they're updates or identical.
@@ -112,7 +112,7 @@ mod tests {
     #[test]
     pub fn polling() {
         let spec = Arc::new(ChainSpec::foundation());
-        let duties_map = Arc::new(EpochDutiesMap::new(spec.epoch_length));
+        let duties_map = Arc::new(EpochDutiesMap::new(spec.slots_per_epoch));
         let keypair = Keypair::random();
         let slot_clock = Arc::new(TestingSlotClock::new(0));
         let beacon_node = Arc::new(TestBeaconNode::default());

validator_client/src/main.rs

@@ -111,7 +111,7 @@ fn main() {
 
     for keypair in keypairs {
         info!(log, "Starting validator services"; "validator" => keypair.pk.concatenated_hex_id());
-        let duties_map = Arc::new(EpochDutiesMap::new(spec.epoch_length));
+        let duties_map = Arc::new(EpochDutiesMap::new(spec.slots_per_epoch));
 
         // Spawn a new thread to maintain the validator's `EpochDuties`.
         let duties_manager_thread = {