More refactor

Author: ali-behjati

hermes/src/store.rs

@@ -2,6 +2,7 @@ use {
     self::{
         proof::wormhole_merkle::construct_update_data,
         storage::{
+            MessageState,
             MessageStateFilter,
             StorageInstance,
         },
@@ -23,7 +24,6 @@ use {
             CompletedAccumulatorState,
         },
         types::{
-            MessageState,
             ProofSet,
             UnixTimestamp,
         },

hermes/src/store/proof/wormhole_merkle.rs

@@ -3,8 +3,8 @@ use {
         storage::{
             AccumulatorState,
             CompletedAccumulatorState,
+            MessageState,
         },
-        types::MessageState,
         Store,
     },
     anyhow::{

hermes/src/store/storage.rs

@@ -3,20 +3,23 @@ use {
         proof::wormhole_merkle::WormholeMerkleState,
         types::{
             AccumulatorMessages,
+            MessageExt,
             MessageIdentifier,
-            MessageState,
             MessageType,
+            ProofSet,
+            RawMessage,
             RequestTime,
             Slot,
+            UnixTimestamp,
         },
     },
     anyhow::{
         anyhow,
         Result,
     },
     async_trait::async_trait,
+    pyth_oracle::Message,
     pyth_sdk::PriceIdentifier,
-    pythnet_sdk::wire::v1::WormholeMerkleRoot,
 };
 
 pub mod local_storage;
@@ -53,6 +56,54 @@ impl TryFrom<AccumulatorState> for CompletedAccumulatorState {
     }
 }
 
+#[derive(Clone, PartialEq, Eq, Debug, PartialOrd, Ord)]
+pub struct MessageStateTime {
+    pub publish_time: UnixTimestamp,
+    pub slot:         Slot,
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub struct MessageState {
+    pub publish_time: UnixTimestamp,
+    pub slot:         Slot,
+    pub id:           MessageIdentifier,
+    pub message:      Message,
+    pub raw_message:  RawMessage,
+    pub proof_set:    ProofSet,
+    pub received_at:  UnixTimestamp,
+}
+
+impl MessageState {
+    pub fn time(&self) -> MessageStateTime {
+        MessageStateTime {
+            publish_time: self.publish_time,
+            slot:         self.slot,
+        }
+    }
+
+    pub fn key(&self) -> MessageIdentifier {
+        self.id.clone()
+    }
+
+    pub fn new(
+        message: Message,
+        raw_message: RawMessage,
+        proof_set: ProofSet,
+        slot: Slot,
+        received_at: UnixTimestamp,
+    ) -> Self {
+        Self {
+            publish_time: message.publish_time(),
+            slot,
+            id: message.id(),
+            message,
+            raw_message,
+            proof_set,
+            received_at,
+        }
+    }
+}
+
 #[derive(Clone, Copy)]
 pub enum MessageStateFilter {
     All,

hermes/src/store/types.rs

@@ -58,58 +58,12 @@ pub struct MessageIdentifier {
     pub type_:    MessageType,
 }
 
-#[derive(Clone, PartialEq, Eq, Debug, PartialOrd, Ord)]
-pub struct MessageTime {
-    pub publish_time: UnixTimestamp,
-    pub slot:         Slot,
-}
 
 #[derive(Clone, PartialEq, Debug)]
 pub struct ProofSet {
     pub wormhole_merkle_proof: WormholeMerkleMessageProof,
 }
 
-#[derive(Clone, PartialEq, Debug)]
-pub struct MessageState {
-    pub publish_time: UnixTimestamp,
-    pub slot:         Slot,
-    pub id:           MessageIdentifier,
-    pub message:      Message,
-    pub raw_message:  RawMessage,
-    pub proof_set:    ProofSet,
-    pub received_at:  UnixTimestamp,
-}
-
-impl MessageState {
-    pub fn time(&self) -> MessageTime {
-        MessageTime {
-            publish_time: self.publish_time,
-            slot:         self.slot,
-        }
-    }
-
-    pub fn key(&self) -> MessageIdentifier {
-        self.id.clone()
-    }
-
-    pub fn new(
-        message: Message,
-        raw_message: RawMessage,
-        proof_set: ProofSet,
-        slot: Slot,
-        received_at: UnixTimestamp,
-    ) -> Self {
-        Self {
-            publish_time: message.publish_time(),
-            slot,
-            id: message.id(),
-            message,
-            raw_message,
-            proof_set,
-            received_at,
-        }
-    }
-}
 
 pub type Slot = u64;
 pub type UnixTimestamp = i64;