Update Artifact trait

Author: jpraynaud

mithril-aggregator/src/artifact_builder/dummy_artifact.rs

@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 use async_trait::async_trait;
 use mithril_common::{
     entities::Certificate,
@@ -12,24 +10,19 @@ use crate::artifact_builder::ArtifactBuilder;
 
 /// Dummy artifact
 #[derive(Serialize, Deserialize, PartialEq, Debug)]
-pub struct DummyArtifact<'a> {
+pub struct DummyArtifact {
     message: String,
     beacon: DummyBeacon,
-    phantom: PhantomData<&'a DummyBeacon>,
 }
 
-impl<'a> DummyArtifact<'a> {
+impl DummyArtifact {
     /// Dummy artifact factory
     pub fn new(message: String, beacon: DummyBeacon) -> Self {
-        Self {
-            message,
-            beacon,
-            phantom: PhantomData,
-        }
+        Self { message, beacon }
     }
 }
 
-impl<'a> Artifact<'a> for DummyArtifact<'a> {}
+impl Artifact for DummyArtifact {}
 
 /// A [DummyArtifact] builder
 pub struct DummyArtifactBuilder {}
@@ -48,9 +41,9 @@ impl Default for DummyArtifactBuilder {
 }
 
 #[async_trait]
-impl<'a> ArtifactBuilder<'a, DummyBeacon, DummyArtifact<'a>> for DummyArtifactBuilder {
+impl ArtifactBuilder<DummyBeacon, DummyArtifact> for DummyArtifactBuilder {
     async fn compute_artifact(
-        &'a self,
+        &self,
         beacon: DummyBeacon,
         certificate: &Certificate,
     ) -> StdResult<DummyArtifact> {

mithril-aggregator/src/artifact_builder/interface.rs

@@ -5,13 +5,17 @@ use mithril_common::{
     StdResult,
 };
 
+#[cfg(test)]
+use mockall::automock;
+
 /// ArtifactBuilder is trait for building an artifact
+#[cfg_attr(test, automock)]
 #[async_trait]
-pub trait ArtifactBuilder<'a, U, W>
+pub trait ArtifactBuilder<U, W>: Send + Sync
 where
     U: Beacon,
-    W: Artifact<'a>,
+    W: Artifact,
 {
     /// Compute an artifact
-    async fn compute_artifact(&'a self, beacon: U, certificate: &Certificate) -> StdResult<W>;
+    async fn compute_artifact(&self, beacon: U, certificate: &Certificate) -> StdResult<W>;
 }

mithril-common/src/signable_builder/interface.rs

@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::Debug;
 
 use crate::{entities::ProtocolMessage, StdResult};
@@ -14,7 +14,7 @@ pub trait Signable: Send + Sync {
 }
 
 /// Artifact is a trait for types that represent signed artifacts
-pub trait Artifact<'a>: Serialize + Deserialize<'a> + PartialEq + Debug {}
+pub trait Artifact: Serialize + DeserializeOwned + PartialEq + Debug + Send + Sync {}
 
 /// SignableBuilder is trait for building a signable for a beacon
 #[async_trait]