Fix conflicts rebasing eip4844

This commit is contained in:
Emilia Hane
2023-02-06 14:34:28 +01:00
parent d292a3a6a8
commit e9e198a2b6
17 changed files with 93 additions and 61 deletions

View File

@@ -67,12 +67,6 @@ impl SlotClock for SystemTimeSlotClock {
}
}
impl From<ManualSlotClock> for SystemTimeSlotClock {
fn from(clock: ManualSlotClock) -> Self {
SystemTimeSlotClock { clock }
}
}
#[cfg(test)]
mod tests {
use super::*;