From 950318101ac50aa578efee1bc243b185e13abd00 Mon Sep 17 00:00:00 2001 From: Nander Stabel Date: Wed, 31 Jul 2024 10:40:14 +0200 Subject: [PATCH] refactor: remove unused 'services' --- Cargo.lock | 1 + agent_issuance/src/credential/mod.rs | 1 - agent_issuance/src/credential/services.rs | 1 - agent_issuance/src/offer/aggregate.rs | 1 - agent_issuance/src/offer/mod.rs | 1 - agent_issuance/src/offer/services.rs | 1 - agent_issuance/src/server_config/aggregate.rs | 7 +++---- agent_issuance/src/server_config/mod.rs | 1 - agent_issuance/src/server_config/services.rs | 1 - agent_secret_manager/Cargo.toml | 1 + agent_store/src/in_memory.rs | 3 +-- agent_store/src/postgres.rs | 3 +-- 12 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 agent_issuance/src/credential/services.rs delete mode 100644 agent_issuance/src/offer/services.rs delete mode 100644 agent_issuance/src/server_config/services.rs diff --git a/Cargo.lock b/Cargo.lock index 9a060bc8..f791a121 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,6 +191,7 @@ dependencies = [ "cqrs-es", "did_manager", "futures", + "identity_iota", "jsonwebtoken", "log", "oid4vc-core", diff --git a/agent_issuance/src/credential/mod.rs b/agent_issuance/src/credential/mod.rs index 0927e54e..5c6981d1 100644 --- a/agent_issuance/src/credential/mod.rs +++ b/agent_issuance/src/credential/mod.rs @@ -4,4 +4,3 @@ pub mod entity; pub mod error; pub mod event; pub mod queries; -pub mod services; diff --git a/agent_issuance/src/credential/services.rs b/agent_issuance/src/credential/services.rs deleted file mode 100644 index a860b6e1..00000000 --- a/agent_issuance/src/credential/services.rs +++ /dev/null @@ -1 +0,0 @@ -pub struct CredentialServices; diff --git a/agent_issuance/src/offer/aggregate.rs b/agent_issuance/src/offer/aggregate.rs index 85e24572..ac669a82 100644 --- a/agent_issuance/src/offer/aggregate.rs +++ b/agent_issuance/src/offer/aggregate.rs @@ -1,4 +1,3 @@ -// use agent_secret_manager::services::SecretManagerServices; use agent_shared::generate_random_string; use async_trait::async_trait; use cqrs_es::Aggregate; diff --git a/agent_issuance/src/offer/mod.rs b/agent_issuance/src/offer/mod.rs index fb5ea5ad..7d8a943f 100644 --- a/agent_issuance/src/offer/mod.rs +++ b/agent_issuance/src/offer/mod.rs @@ -3,4 +3,3 @@ pub mod command; pub mod error; pub mod event; pub mod queries; -pub mod services; diff --git a/agent_issuance/src/offer/services.rs b/agent_issuance/src/offer/services.rs deleted file mode 100644 index cb3acf89..00000000 --- a/agent_issuance/src/offer/services.rs +++ /dev/null @@ -1 +0,0 @@ -pub struct OfferServices; diff --git a/agent_issuance/src/server_config/aggregate.rs b/agent_issuance/src/server_config/aggregate.rs index f1093093..f4284d57 100644 --- a/agent_issuance/src/server_config/aggregate.rs +++ b/agent_issuance/src/server_config/aggregate.rs @@ -15,7 +15,6 @@ use tracing::info; use crate::server_config::command::ServerConfigCommand; use crate::server_config::error::ServerConfigError; use crate::server_config::event::ServerConfigEvent; -use crate::server_config::services::ServerConfigServices; /// An aggregate that holds the configuration of the server. #[derive(Clone, Default, Deserialize, Serialize, Debug)] @@ -29,7 +28,7 @@ impl Aggregate for ServerConfig { type Command = ServerConfigCommand; type Event = ServerConfigEvent; type Error = ServerConfigError; - type Services = ServerConfigServices; + type Services = (); fn aggregate_type() -> String { "server_config".to_string() @@ -156,7 +155,7 @@ pub mod server_config_tests { #[test] fn test_load_server_metadata() { - ServerConfigTestFramework::with(ServerConfigServices) + ServerConfigTestFramework::with(()) .given_no_previous_events() .when(ServerConfigCommand::InitializeServerMetadata { authorization_server_metadata: AUTHORIZATION_SERVER_METADATA.clone(), @@ -169,7 +168,7 @@ pub mod server_config_tests { } #[test] fn test_create_credentials_supported() { - ServerConfigTestFramework::with(ServerConfigServices) + ServerConfigTestFramework::with(()) .given(vec![ServerConfigEvent::ServerMetadataInitialized { authorization_server_metadata: AUTHORIZATION_SERVER_METADATA.clone(), credential_issuer_metadata: CREDENTIAL_ISSUER_METADATA.clone(), diff --git a/agent_issuance/src/server_config/mod.rs b/agent_issuance/src/server_config/mod.rs index fb5ea5ad..7d8a943f 100644 --- a/agent_issuance/src/server_config/mod.rs +++ b/agent_issuance/src/server_config/mod.rs @@ -3,4 +3,3 @@ pub mod command; pub mod error; pub mod event; pub mod queries; -pub mod services; diff --git a/agent_issuance/src/server_config/services.rs b/agent_issuance/src/server_config/services.rs deleted file mode 100644 index 1b10cb07..00000000 --- a/agent_issuance/src/server_config/services.rs +++ /dev/null @@ -1 +0,0 @@ -pub struct ServerConfigServices; diff --git a/agent_secret_manager/Cargo.toml b/agent_secret_manager/Cargo.toml index dc3588f6..632f9522 100644 --- a/agent_secret_manager/Cargo.toml +++ b/agent_secret_manager/Cargo.toml @@ -12,6 +12,7 @@ async-trait = "0.1" base64.workspace = true cqrs-es = "0.4.2" did_manager.workspace = true +identity_iota.workspace = true jsonwebtoken = "9.3" log = "0.4" oid4vc-core.workspace = true diff --git a/agent_store/src/in_memory.rs b/agent_store/src/in_memory.rs index f57862fc..7b016c66 100644 --- a/agent_store/src/in_memory.rs +++ b/agent_store/src/in_memory.rs @@ -6,7 +6,6 @@ use agent_issuance::{ pre_authorized_code::{PreAuthorizedCodeQuery, PreAuthorizedCodeView}, }, }, - server_config::services::ServerConfigServices, services::IssuanceServices, state::{CommandHandlers, IssuanceState, ViewRepositories}, SimpleLoggingQuery, @@ -139,7 +138,7 @@ pub async fn issuance_state( command: CommandHandlers { server_config: Arc::new( server_config_event_publishers.into_iter().fold( - AggregateHandler::new(ServerConfigServices) + AggregateHandler::new(()) .append_query(SimpleLoggingQuery {}) .append_query(generic_query(server_config.clone())), |aggregate_handler, event_publisher| aggregate_handler.append_event_publisher(event_publisher), diff --git a/agent_store/src/postgres.rs b/agent_store/src/postgres.rs index 484be97a..4d38d448 100644 --- a/agent_store/src/postgres.rs +++ b/agent_store/src/postgres.rs @@ -1,6 +1,5 @@ use agent_issuance::{ offer::queries::{access_token::AccessTokenQuery, pre_authorized_code::PreAuthorizedCodeQuery}, - server_config::services::ServerConfigServices, services::IssuanceServices, state::{CommandHandlers, IssuanceState, ViewRepositories}, SimpleLoggingQuery, @@ -92,7 +91,7 @@ pub async fn issuance_state( command: CommandHandlers { server_config: Arc::new( server_config_event_publishers.into_iter().fold( - AggregateHandler::new(pool.clone(), ServerConfigServices) + AggregateHandler::new(pool.clone(), ()) .append_query(SimpleLoggingQuery {}) .append_query(generic_query(server_config.clone())), |aggregate_handler, event_publisher| aggregate_handler.append_event_publisher(event_publisher),