Represent slots in secs instead of millisecs (#2163)

## Issue Addressed

NA

## Proposed Changes

Copied from #2083, changes the config milliseconds_per_slot to seconds_per_slot to avoid errors when slot duration is not a multiple of a second. To avoid deserializing old serialized data (with milliseconds instead of seconds) the Serialize and Deserialize derive got removed from the Spec struct (isn't currently used anyway).

This PR replaces #2083 for the purpose of fixing a merge conflict without requiring the input of @blacktemplar.

## Additional Info

NA


Co-authored-by: blacktemplar <blacktemplar@a1.net>

common/eth2_config/Cargo.toml

@@ -7,5 +7,4 @@ edition = "2018"
 [dependencies]
 serde = "1.0.116"
 serde_derive = "1.0.116"
-toml = "0.5.6"
 types = { path = "../../consensus/types" }

common/eth2_config/src/lib.rs

@@ -1,4 +1,3 @@
-use serde_derive::{Deserialize, Serialize};
 use std::env;
 use std::path::PathBuf;
 use types::{ChainSpec, EthSpecId};
@@ -16,8 +15,7 @@ pub const GENESIS_FILE_NAME: &str = "genesis.ssz";
 pub const GENESIS_ZIP_FILE_NAME: &str = "genesis.ssz.zip";
 
 /// The core configuration of a Lighthouse beacon node.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
+#[derive(Debug, Clone)]
 pub struct Eth2Config {
     pub eth_spec_id: EthSpecId,
     pub spec: ChainSpec,
@@ -125,15 +123,3 @@ define_net!(pyrmont, include_pyrmont_file, "pyrmont", true);
 define_net!(mainnet, include_mainnet_file, "mainnet", true);
 
 define_net!(toledo, include_toledo_file, "toledo", true);
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use toml;
-
-    #[test]
-    fn serde_serialize() {
-        let _ =
-            toml::to_string(&Eth2Config::default()).expect("Should serde encode default config");
-    }
-}

common/slot_clock/src/metrics.rs

@@ -9,9 +9,9 @@ lazy_static! {
         try_create_int_gauge("slotclock_present_epoch", "The present wall-clock epoch");
     pub static ref SLOTS_PER_EPOCH: Result<IntGauge> =
         try_create_int_gauge("slotclock_slots_per_epoch", "Slots per epoch (constant)");
-    pub static ref MILLISECONDS_PER_SLOT: Result<IntGauge> = try_create_int_gauge(
-        "slotclock_slot_time_milliseconds",
-        "The duration in milliseconds between each slot"
+    pub static ref SECONDS_PER_SLOT: Result<IntGauge> = try_create_int_gauge(
+        "slotclock_slot_time_seconds",
+        "The duration in seconds between each slot"
     );
 }
 
@@ -28,8 +28,5 @@ pub fn scrape_for_metrics<T: EthSpec, U: SlotClock>(clock: &U) {
         present_slot.epoch(T::slots_per_epoch()).as_u64() as i64,
     );
     set_gauge(&SLOTS_PER_EPOCH, T::slots_per_epoch() as i64);
-    set_gauge(
-        &MILLISECONDS_PER_SLOT,
-        clock.slot_duration().as_millis() as i64,
-    );
+    set_gauge(&SECONDS_PER_SLOT, clock.slot_duration().as_secs() as i64);
 }