Skip to content

Commit 005ec5e

Browse files
committed
Move Artifact trait to 'mithril-common'
1 parent 01921eb commit 005ec5e

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

mithril-aggregator/src/artifact_builder/artifact_builder_service.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ use std::sync::Arc;
22

33
use mithril_common::{
44
entities::{Certificate, SignedEntityType},
5-
signable_builder::DummyBeacon,
5+
signable_builder::{Artifact, DummyBeacon},
66
StdResult,
77
};
88

9-
use crate::artifact_builder::{Artifact, DummyArtifactBuilder};
10-
11-
use super::ArtifactBuilder;
9+
use crate::artifact_builder::{ArtifactBuilder, DummyArtifactBuilder};
1210

1311
/// ArtifactBuilder Service
1412
// TODO: temporary implementation

mithril-aggregator/src/artifact_builder/dummy_artifact.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
use std::marker::PhantomData;
22

33
use async_trait::async_trait;
4-
use mithril_common::{entities::Certificate, signable_builder::DummyBeacon, StdResult};
4+
use mithril_common::{
5+
entities::Certificate,
6+
signable_builder::{Artifact, DummyBeacon},
7+
StdResult,
8+
};
59
use serde::{Deserialize, Serialize};
610

7-
use crate::artifact_builder::{Artifact, ArtifactBuilder};
11+
use crate::artifact_builder::ArtifactBuilder;
812

913
/// Dummy artifact
1014
#[derive(Serialize, Deserialize, PartialEq, Debug)]

mithril-aggregator/src/artifact_builder/interface.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
use async_trait::async_trait;
2-
use mithril_common::{entities::Certificate, signable_builder::Beacon, StdResult};
3-
use serde::{Deserialize, Serialize};
4-
use std::fmt::Debug;
5-
6-
/// Artifact is a trait for types that represent signed artifacts
7-
pub trait Artifact<'a>: Serialize + Deserialize<'a> + PartialEq + Debug {}
2+
use mithril_common::{
3+
entities::Certificate,
4+
signable_builder::{Artifact, Beacon},
5+
StdResult,
6+
};
87

98
/// ArtifactBuilder is trait for building an artifact
109
#[async_trait]

mithril-common/src/signable_builder/interface.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
use async_trait::async_trait;
2+
use serde::{Deserialize, Serialize};
3+
use std::fmt::Debug;
24

35
use crate::{entities::ProtocolMessage, StdResult};
46

@@ -11,6 +13,9 @@ pub trait Signable: Send + Sync {
1113
fn compute_protocol_message(&self) -> StdResult<ProtocolMessage>;
1214
}
1315

16+
/// Artifact is a trait for types that represent signed artifacts
17+
pub trait Artifact<'a>: Serialize + Deserialize<'a> + PartialEq + Debug {}
18+
1419
/// SignableBuilder is trait for building a signable for a beacon
1520
#[async_trait]
1621
pub trait SignableBuilder<U, V>

0 commit comments

Comments
 (0)