Moving plugin traits to top module such as to isolate plugin implementation details

did-endpoint/Cargo.toml

@@ -6,23 +6,23 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.73"
 axum = { version = "0.6.20" }
 chrono = { version = "0.4.26" }
 did-utils = { path = "../did-utils"}
 dotenv-flow = "0.15.0"
 hyper = { version = "0.14.27", features = ["full"] }
-lazy_static = "1.4.0"
 multibase = { version = "0.8.0" } # earlier version due to 'did-utils'
 serde_json = "1.0.104"
 thiserror = "1.0.49"
 tokio = { version = "1.30.0", features = ["full"] }
-tower-http = { version = "0.4.3" }
 tracing = "0.1.37"
 url = { version = "2.4.0" }
 uuid = { version = "1.4.1", features = ["v4"] }
 zeroize = { version = "1.6.0" }
 
+# Plugins traits
+server-plugin = { path = "../server-plugin" }
+
 [dev-dependencies]
 json-canon = "0.1.3"
 tower = { version = "0.4.13", features = ["util"] }

did-endpoint/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod didgen;
 pub mod web;
+pub mod plugin;
 
 mod util;

generic-server/src/plugin/did_endpoint/mod.rs → did-endpoint/src/plugin.rs

@@ -1,7 +1,6 @@
 use axum::Router;
-use did_endpoint::{didgen, web};
-
-use super::traits::{Plugin, PluginError};
+use super::{didgen, web};
+use server_plugin::{Plugin, PluginError};
 
 #[derive(Default)]
 pub struct DidEndpointPlugin;

generic-server/Cargo.toml

@@ -18,6 +18,9 @@ tower-http = { version = "0.4.3", features = ["catch-panic", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["json"] }
 
+# Plugins traits
+server-plugin = { path = "../server-plugin" }
+
 # optional
 chrono = { version = "0.4.26", optional = true }
 did-endpoint = { path = "../did-endpoint", optional = true }

generic-server/src/plugin/container.rs

@@ -1,11 +1,9 @@
 use std::collections::{HashMap, HashSet};
 
 use axum::Router;
+use server_plugin::{Plugin, PluginError};
 
-use super::{
-    traits::{Plugin, PluginError},
-    PLUGINS,
-};
+use super::PLUGINS;
 
 #[derive(Debug, PartialEq)]
 pub enum PluginContainerError {

generic-server/src/plugin/index/mod.rs

@@ -1,8 +1,7 @@
 mod web;
 
 use axum::Router;
-
-use super::traits::{Plugin, PluginError};
+use server_plugin::{Plugin, PluginError};
 
 #[derive(Default)]
 pub struct IndexPlugin;

generic-server/src/plugin/mod.rs

@@ -1,20 +1,16 @@
 pub mod container;
-pub mod traits;
 
 use lazy_static::lazy_static;
-use traits::Plugin;
+use server_plugin::Plugin;
 
 #[cfg(feature = "plugin-index")]
 mod index;
 
-#[cfg(feature = "plugin-did_endpoint")]
-mod did_endpoint;
-
 lazy_static! {
     pub static ref PLUGINS: Vec<Box<dyn Plugin>> = vec![
         #[cfg(feature = "plugin-index")]
         Box::<index::IndexPlugin>::default(),
         #[cfg(feature = "plugin-did_endpoint")]
-        Box::<did_endpoint::DidEndpointPlugin>::default(),
+        Box::<did_endpoint::plugin::DidEndpointPlugin>::default(),
     ];
 }

run_test.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-for dir in ./did-utils/ ./did-endpoint/ ./generic-server/ ./mediator-server/
+for dir in ./did-utils/ ./did-endpoint/ ./generic-server/
 do
   cd "${dir}"
   if [ -f Cargo.toml ]; then

server-plugin/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "server-plugin"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+axum = { version = "0.6.20" }