fix: handle merge conflicts with main branch

Author: jpraynaud

mithril-signer/src/runtime/runner.rs

@@ -6,8 +6,8 @@ use tokio::sync::RwLockReadGuard;
 
 use mithril_common::crypto_helper::{KESPeriod, OpCert, ProtocolOpCert, SerDeShelleyFileFormat};
 use mithril_common::entities::{
-    CertificatePending, Epoch, EpochSettings, PartyId, ProtocolMessage, SignedEntityType, Signer,
-    SignerWithStake, SingleSignatures, TimePoint,
+    CertificatePending, Epoch, PartyId, ProtocolMessage, SignedEntityType, Signer, SignerWithStake,
+    SingleSignatures, TimePoint,
 };
 use mithril_common::StdResult;
 use mithril_persistence::store::StakeStorer;

mithril-signer/src/services/epoch_service.rs

@@ -230,7 +230,7 @@ pub mod mock {
         impl EpochService for EpochServiceImpl {
             /// Inform the service a new epoch has been detected, telling it to update its
             /// internal state for the new epoch.
-            fn inform_epoch_settings(&mut self, epoch_settings: EpochSettings) -> StdResult<()>;
+            fn inform_epoch_settings(&mut self, epoch_settings: SignerEpochSettings) -> StdResult<()>;
 
             /// Get the current epoch for which the data stored in this service are computed.
             fn epoch_of_current_data(&self) -> StdResult<Epoch>;