refactor: remove unused 'services'

impierce · Jul 31, 2024 · 9503181 · 9503181
1 parent e7ad5a2
commit 9503181
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
diff --git 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
@@ -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
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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),