move struct and enum used in interface to a model file

Author: turmelclem

internal/mithril-protocol-config/src/http/http_impl.rs

@@ -4,7 +4,8 @@ use std::{collections::BTreeSet, sync::Arc, time::Duration};
 use crate::{
     HTTP_REQUEST_TIMEOUT_DURATION,
     http::aggregator_client::{AggregatorClient, AggregatorHTTPClient},
-    interface::{MithrilNetworkConfiguration, MithrilNetworkConfigurationProvider},
+    interface::MithrilNetworkConfigurationProvider,
+    model::MithrilNetworkConfiguration,
 };
 use async_trait::async_trait;
 use mithril_common::StdResult;
@@ -44,7 +45,7 @@ impl MithrilNetworkConfigurationProvider for HttpMithrilNetworkConfigurationProv
             return Err(anyhow!("Failed to retrieve epoch settings"));
         };
 
-        let available_signed_entity_types = BTreeSet::new(); // To be implemented
+        let available_signed_entity_types = BTreeSet::new(); // To be implemented to be retrieve from /aggreagator-features from aggregator_client.rs
         let signed_entity_types_config = vec![]; // To be implemented
 
         Ok(MithrilNetworkConfiguration {

internal/mithril-protocol-config/src/interface.rs

@@ -1,30 +1,7 @@
 use async_trait::async_trait;
 use mithril_common::StdResult;
-use mithril_common::entities::{
-    CardanoTransactionsSigningConfig, Epoch, ProtocolParameters, SignedEntityTypeDiscriminants,
-};
-use std::collections::BTreeSet;
 
-/// Signed entity type specific configurations
-pub enum SignedEntityTypeConfiguration {
-    /// Cardano Transactions
-    CardanoTransactions(CardanoTransactionsSigningConfig),
-}
-
-/// A Mithril network configuration
-pub struct MithrilNetworkConfiguration {
-    /// Epoch
-    pub epoch: Epoch,
-
-    /// Cryptographic protocol parameters (`k`, `m` and `phi_f`)
-    pub signer_registration_protocol_parameters: ProtocolParameters,
-
-    /// List of available types of certifications (`CardanoDatabase`, `CardanoTransactions`, `CardanoStakeDistribution`, ...)
-    pub available_signed_entity_types: BTreeSet<SignedEntityTypeDiscriminants>,
-
-    /// Custom configurations for signed entity types (e.g. `cardano_transactions_signing_config` for `CardanoTransactions`)
-    pub signed_entity_types_config: Vec<SignedEntityTypeConfiguration>, //or HashMap<SignedEntityTypeDiscriminant, SignedEntityTypeConfiguration>
-}
+use crate::model::MithrilNetworkConfiguration;
 
 /// Trait to provide the current Mithril network configuration.
 #[async_trait]

internal/mithril-protocol-config/src/lib.rs

@@ -2,6 +2,7 @@
 const HTTP_REQUEST_TIMEOUT_DURATION: u64 = 30000;
 pub mod http;
 pub mod interface;
+pub mod model;
 pub mod signer_epoch_settings;
 
 #[cfg(test)]

internal/mithril-protocol-config/src/model.rs

@@ -0,0 +1,25 @@
+use std::collections::BTreeSet;
+
+use mithril_common::entities::{
+    CardanoTransactionsSigningConfig, Epoch, ProtocolParameters, SignedEntityTypeDiscriminants,
+};
+
+pub enum SignedEntityTypeConfiguration {
+    /// Cardano Transactions
+    CardanoTransactions(CardanoTransactionsSigningConfig),
+}
+
+/// A Mithril network configuration
+pub struct MithrilNetworkConfiguration {
+    /// Epoch
+    pub epoch: Epoch,
+
+    /// Cryptographic protocol parameters (`k`, `m` and `phi_f`)
+    pub signer_registration_protocol_parameters: ProtocolParameters,
+
+    /// List of available types of certifications (`CardanoDatabase`, `CardanoTransactions`, `CardanoStakeDistribution`, ...)
+    pub available_signed_entity_types: BTreeSet<SignedEntityTypeDiscriminants>,
+
+    /// Custom configurations for signed entity types (e.g. `cardano_transactions_signing_config` for `CardanoTransactions`)
+    pub signed_entity_types_config: Vec<SignedEntityTypeConfiguration>, //or HashMap<SignedEntityTypeDiscriminant, SignedEntityTypeConfiguration>
+}