delete duplicate old ereport types

i thought i had gotten rid of these...

Author: hawkw

gateway-messages/src/mgs_to_sp.rs

@@ -4,7 +4,6 @@
 
 //! Types for messages sent from MGS to SPs.
 
-use crate::ereport;
 use crate::ignition::TransceiverSelect;
 use crate::BadRequestReason;
 use crate::PowerState;
@@ -437,117 +436,3 @@ pub enum DumpRequest {
         key: [u8; 16],
     },
 }
-
-/// A versioned request for ereports aggregated by the SP's snitch task.
-///
-/// See [RFD 545 §4.4.3.1] for details.
-/// [RFD 545 §4.4.3.1]: https://rfd.shared.oxide.computer/rfd/0545#_requestcommit
-#[derive(
-    Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, SerializedSize,
-)]
-pub enum EreportRequest {
-    // /!\ ORDER MATTERS /!\
-    V0(EreportRequestV0),
-}
-
-/// A request for ereports aggregated by the SP's snitch task, version 0.
-///
-/// ```text
-///     0         1        2        3
-/// +--------+--------+--------+--------+
-/// | version|-------C|    unused       |
-/// +--------+--------+--------+--------+
-/// |                                   |
-/// +                                   +
-/// |                                   |
-/// +       restart ID (128 bits)       +
-/// |                                   |
-/// +                                   +
-/// |                                   |
-/// +--------+--------+--------+--------+
-/// |                                   |
-/// +   first ENA desired in response   +
-/// |                                   |
-/// +--------+--------+--------+--------+
-/// |                                   |
-/// +   last ENA written to database    + only present when C bit set
-/// |                                   |
-/// +--------+--------+--------+--------+
-/// ```
-///
-/// See [RFD 545 §4.4.3.1] for details.
-/// [RFD 545 §4.4.3.1]: https://rfd.shared.oxide.computer/rfd/0545#_requestcommit
-#[derive(
-    Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, SerializedSize,
-)]
-pub struct EreportRequestV0 {
-    pub flags: EreportRequestFlags,
-
-    /// Currently unused as of this protocol version.
-    _reserved: [u8; 2],
-
-    /// The restart ID of the SP's snitch task which the control plane believes
-    /// is current.
-    ///
-    /// If this value does not match the reporter's current restart ID, the
-    /// reporter's response will include the current restart ID, and will start
-    /// at the earliest known ENA, rather than the provided `start_ena`.
-    ///
-    /// If the control plane does not know the SP's restart ID, this will be 0. IDs
-    /// generated by the snitch task on startup must not be 0.
-    pub restart_id: ereport::RestartId,
-
-    /// If present, the snitch should not include ENAs earlier than this one
-    /// in its response, provided that the requested reporter generation matches
-    /// the current generation.
-    pub start_ena: ereport::Ena,
-
-    /// The ENA of the last ereport committed to persistent storage from the
-    /// requested reporter restart.
-    ///
-    /// If the restart ID parameter matches the reporter's current restart,
-    /// it is permitted to discard any ereports with ENAs up to and including
-    /// this value. If the restart ID has changed from the provided one, the
-    /// reporter will not discard data.
-    ///
-    /// This value is only present if the [`EreportRequestFlags::COMMIT`] bit is
-    /// set.
-    pub committed_ena: ereport::Ena,
-}
-
-/// Flags for [`EreportRequest`] packets.
-#[derive(
-    Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, SerializedSize,
-)]
-#[repr(transparent)]
-pub struct EreportRequestFlags(u8);
-
-bitflags::bitflags! {
-    impl EreportRequestFlags: u8 {
-        /// Indicates that a "committed ENA" field is present in this request.
-        ///
-        /// If this is not set, the "committed ENA" field will be zero, but this
-        /// does not indicate that ENA 0 has been committed.
-        const COMMIT = 1 << 0;
-    }
-}
-
-impl EreportRequestV0 {
-    pub const fn new(
-        restart_id: ereport::RestartId,
-        start_ena: ereport::Ena,
-        committed_ena: Option<ereport::Ena>,
-    ) -> Self {
-        let (committed_ena, flags) = match committed_ena {
-            Some(ena) => (ena, EreportRequestFlags::COMMIT),
-            None => (ereport::Ena(0), EreportRequestFlags::empty()),
-        };
-        Self {
-            flags,
-            _reserved: [0u8; 2],
-            restart_id,
-            start_ena,
-            committed_ena,
-        }
-    }
-}