Remove TssId.

primitives/src/shard.rs

@@ -5,7 +5,7 @@ use futures::channel::oneshot;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
-use crate::{TaskId, TaskPhase};
+use crate::TaskExecution;
 use scale_codec::{Decode, Encode};
 use scale_info::prelude::string::String;
 use scale_info::TypeInfo;
@@ -20,26 +20,6 @@ pub type ShardId = u64;
 pub type ProofOfKnowledge = [u8; 65];
 pub type Commitment = Vec<TssPublicKey>;
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct TssId {
-	task_id: TaskId,
-	task_phase: TaskPhase,
-}
-
-impl TssId {
-	pub fn new(task_id: TaskId, task_phase: TaskPhase) -> Self {
-		Self { task_id, task_phase }
-	}
-}
-
-#[cfg(feature = "std")]
-impl std::fmt::Display for TssId {
-	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-		write!(f, "{}-{}", self.task_id, self.task_phase)
-	}
-}
-
 #[derive(Debug, Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
 pub enum MemberStatus {
 	Added,

primitives/src/task.rs

@@ -173,8 +173,8 @@ impl Default for TaskPhase {
 	}
 }
 
-#[cfg_attr(feature = "std", derive(Serialize))]
-#[derive(Debug, Clone, Encode, Decode, TypeInfo, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Clone, Copy, Debug, Encode, Decode, TypeInfo, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct TaskExecution {
 	pub task_id: TaskId,
 	pub phase: TaskPhase,
@@ -189,7 +189,7 @@ impl TaskExecution {
 #[cfg(feature = "std")]
 impl std::fmt::Display for TaskExecution {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-		write!(f, "{}", self.task_id)
+		write!(f, "{}-{}", self.task_id, self.phase)
 	}
 }