diff --git a/mithril-aggregator/src/command_args.rs b/mithril-aggregator/src/command_args.rs index 9a9d896c360..3a707aba318 100644 --- a/mithril-aggregator/src/command_args.rs +++ b/mithril-aggregator/src/command_args.rs @@ -18,7 +18,7 @@ use tokio::{ }; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, certificate_chain::MithrilCertificateVerifier, chain_observer::{CardanoCliRunner, ChainObserver}, crypto_helper::{ diff --git a/mithril-aggregator/src/dependency.rs b/mithril-aggregator/src/dependency.rs index 0aa23815739..7192f80c146 100644 --- a/mithril-aggregator/src/dependency.rs +++ b/mithril-aggregator/src/dependency.rs @@ -1,5 +1,5 @@ use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, certificate_chain::CertificateVerifier, chain_observer::ChainObserver, crypto_helper::ProtocolGenesisVerifier, @@ -275,7 +275,7 @@ pub mod tests { SingleSignatureStore, SnapshotUploaderType, VerificationKeyStore, }; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, certificate_chain::MithrilCertificateVerifier, chain_observer::FakeObserver, crypto_helper::{key_encode_hex, ProtocolGenesisSigner}, diff --git a/mithril-aggregator/src/http_server/routes/router.rs b/mithril-aggregator/src/http_server/routes/router.rs index 43888d27622..b842443676b 100644 --- a/mithril-aggregator/src/http_server/routes/router.rs +++ b/mithril-aggregator/src/http_server/routes/router.rs @@ -4,7 +4,7 @@ use crate::http_server::routes::{ use crate::http_server::SERVER_BASE_PATH; use crate::DependencyManager; -use mithril_common::api::APIVersionProvider; +use mithril_common::api_version::APIVersionProvider; use mithril_common::MITHRIL_API_VERSION_HEADER; use reqwest::StatusCode; diff --git a/mithril-aggregator/tests/test_extensions/dependency.rs b/mithril-aggregator/tests/test_extensions/dependency.rs index 084974961d1..033261f42aa 100644 --- a/mithril-aggregator/tests/test_extensions/dependency.rs +++ b/mithril-aggregator/tests/test_extensions/dependency.rs @@ -5,7 +5,7 @@ use mithril_aggregator::{ MultiSignerImpl, ProtocolParametersStore, SingleSignatureStore, SnapshotUploaderType, VerificationKeyStore, }; -use mithril_common::api::APIVersionProvider; +use mithril_common::api_version::APIVersionProvider; use mithril_common::certificate_chain::MithrilCertificateVerifier; use mithril_common::chain_observer::FakeObserver; use mithril_common::crypto_helper::{key_encode_hex, ProtocolGenesisSigner}; diff --git a/mithril-client/src/aggregator.rs b/mithril-client/src/aggregator.rs index 1f8316bdf06..5de2d5e1c07 100644 --- a/mithril-client/src/aggregator.rs +++ b/mithril-client/src/aggregator.rs @@ -1,7 +1,7 @@ use async_trait::async_trait; use flate2::read::GzDecoder; use futures::StreamExt; -use mithril_common::api::APIVersionProvider; +use mithril_common::api_version::APIVersionProvider; use mithril_common::MITHRIL_API_VERSION_HEADER; use reqwest::{self, Response, StatusCode}; use reqwest::{Client, RequestBuilder}; diff --git a/mithril-client/src/commands/download.rs b/mithril-client/src/commands/download.rs index ba1d11eb4f0..6a5ad316889 100644 --- a/mithril-client/src/commands/download.rs +++ b/mithril-client/src/commands/download.rs @@ -3,7 +3,7 @@ use std::{error::Error, fmt::Display, sync::Arc}; use clap::Parser; use config::{builder::DefaultState, ConfigBuilder}; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, entities::Epoch, era::{EraChecker, SupportedEra}, }; diff --git a/mithril-client/src/commands/list.rs b/mithril-client/src/commands/list.rs index 1e23eb4cce4..97cfbaddade 100644 --- a/mithril-client/src/commands/list.rs +++ b/mithril-client/src/commands/list.rs @@ -4,7 +4,7 @@ use clap::Parser; use cli_table::{print_stdout, WithTitle}; use config::{builder::DefaultState, ConfigBuilder}; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, entities::Epoch, era::{EraChecker, SupportedEra}, }; diff --git a/mithril-client/src/commands/restore.rs b/mithril-client/src/commands/restore.rs index 714f46a263d..c3d4843d185 100644 --- a/mithril-client/src/commands/restore.rs +++ b/mithril-client/src/commands/restore.rs @@ -2,7 +2,7 @@ use clap::Parser; use config::{builder::DefaultState, ConfigBuilder}; use directories::ProjectDirs; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, certificate_chain::MithrilCertificateVerifier, crypto_helper::{key_decode_hex, ProtocolGenesisVerifier}, digesters::{ diff --git a/mithril-client/src/commands/show.rs b/mithril-client/src/commands/show.rs index 4d682c8dfa9..9bdf9117028 100644 --- a/mithril-client/src/commands/show.rs +++ b/mithril-client/src/commands/show.rs @@ -4,7 +4,7 @@ use clap::Parser; use cli_table::{print_stdout, WithTitle}; use config::{builder::DefaultState, ConfigBuilder}; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, entities::Epoch, era::{EraChecker, SupportedEra}, }; diff --git a/mithril-common/src/api/mod.rs b/mithril-common/src/api/mod.rs deleted file mode 100644 index 9ff2b0b2e95..00000000000 --- a/mithril-common/src/api/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -//! The module used for handling api - -mod version; - -pub use version::{APIVersionProvider, APIVersionProviderError}; diff --git a/mithril-common/src/api/version.rs b/mithril-common/src/api_version.rs similarity index 99% rename from mithril-common/src/api/version.rs rename to mithril-common/src/api_version.rs index 6bb9693ef0f..a8c5334d4eb 100644 --- a/mithril-common/src/api/version.rs +++ b/mithril-common/src/api_version.rs @@ -90,7 +90,7 @@ mod test { use std::{collections::HashMap, sync::Arc}; use crate::{ - api::version::APIVersionProvider, + api_version::APIVersionProvider, entities::Epoch, era::{EraChecker, SupportedEra}, }; diff --git a/mithril-common/src/lib.rs b/mithril-common/src/lib.rs index 3cb8638034a..9dfd3812758 100644 --- a/mithril-common/src/lib.rs +++ b/mithril-common/src/lib.rs @@ -10,7 +10,7 @@ //! - A [certificate chain] used to validate the Certificate Chain created by an aggregator //! - The [entities] used by, and exchanged between, the aggregator, signers and client. -pub mod api; +pub mod api_version; mod beacon_provider; pub mod certificate_chain; pub mod chain_observer; diff --git a/mithril-signer/src/certificate_handler.rs b/mithril-signer/src/certificate_handler.rs index 1edd52bf443..843e952d549 100644 --- a/mithril-signer/src/certificate_handler.rs +++ b/mithril-signer/src/certificate_handler.rs @@ -5,7 +5,7 @@ use std::{io, sync::Arc}; use thiserror::Error; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, entities::{CertificatePending, EpochSettings, Signer, SingleSignatures}, messages::{CertificatePendingMessage, EpochSettingsMessage}, MITHRIL_API_VERSION_HEADER, MITHRIL_SIGNER_VERSION_HEADER, diff --git a/mithril-signer/src/runtime/runner.rs b/mithril-signer/src/runtime/runner.rs index dd29fdf17ee..7033dcecab4 100644 --- a/mithril-signer/src/runtime/runner.rs +++ b/mithril-signer/src/runtime/runner.rs @@ -476,7 +476,7 @@ impl Runner for SignerRunner { #[cfg(test)] mod tests { use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, chain_observer::{ChainObserver, FakeObserver}, crypto_helper::ProtocolInitializer, digesters::{DumbImmutableDigester, DumbImmutableFileObserver}, diff --git a/mithril-signer/src/runtime/signer_services.rs b/mithril-signer/src/runtime/signer_services.rs index 333660e1a46..ca6af4ac5f8 100644 --- a/mithril-signer/src/runtime/signer_services.rs +++ b/mithril-signer/src/runtime/signer_services.rs @@ -6,7 +6,7 @@ use std::{ }; use mithril_common::{ - api::APIVersionProvider, + api_version::APIVersionProvider, chain_observer::{CardanoCliChainObserver, CardanoCliRunner, ChainObserver}, crypto_helper::{OpCert, ProtocolPartyId, SerDeShelleyFileFormat}, digesters::{ diff --git a/mithril-signer/tests/test_extensions/state_machine_tester.rs b/mithril-signer/tests/test_extensions/state_machine_tester.rs index 209d0ebccb1..78f5f6287be 100644 --- a/mithril-signer/tests/test_extensions/state_machine_tester.rs +++ b/mithril-signer/tests/test_extensions/state_machine_tester.rs @@ -1,5 +1,5 @@ #![allow(dead_code)] -use mithril_common::api::APIVersionProvider; +use mithril_common::api_version::APIVersionProvider; use mithril_common::digesters::ImmutableFileObserver; use mithril_common::entities::SignerWithStake; use mithril_common::era::{