fix: Generalise FeedMessage to hold a HeaderLike and not a BlockHeader (#624)

Author: dianacarvalho1

tycho-client/src/feed/mod.rs

@@ -35,7 +35,7 @@ pub mod synchronizer;
 /// or simplified structures that only provide a timestamp (e.g., for RFQ logic).
 pub trait HeaderLike {
     fn block(self) -> Option<BlockHeader>;
-    fn ts(self) -> u64;
+    fn block_number_or_timestamp(self) -> u64;
 }
 
 #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize, Eq, Hash)]
@@ -64,8 +64,8 @@ impl HeaderLike for BlockHeader {
         Some(self)
     }
 
-    fn ts(self) -> u64 {
-        self.timestamp
+    fn block_number_or_timestamp(self) -> u64 {
+        self.number
     }
 }
 
@@ -375,14 +375,20 @@ impl SynchronizerStream {
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-pub struct FeedMessage {
-    pub state_msgs: HashMap<String, StateSyncMessage<BlockHeader>>,
+pub struct FeedMessage<H>
+where
+    H: HeaderLike,
+{
+    pub state_msgs: HashMap<String, StateSyncMessage<H>>,
     pub sync_states: HashMap<String, SynchronizerState>,
 }
 
-impl FeedMessage {
+impl<H> FeedMessage<H>
+where
+    H: HeaderLike,
+{
     fn new(
-        state_msgs: HashMap<String, StateSyncMessage<BlockHeader>>,
+        state_msgs: HashMap<String, StateSyncMessage<H>>,
         sync_states: HashMap<String, SynchronizerState>,
     ) -> Self {
         Self { state_msgs, sync_states }
@@ -411,7 +417,9 @@ where
         self.synchronizers = Some(registered);
         self
     }
-    pub async fn run(mut self) -> BlockSyncResult<(JoinHandle<()>, Receiver<FeedMessage>)> {
+    pub async fn run(
+        mut self,
+    ) -> BlockSyncResult<(JoinHandle<()>, Receiver<FeedMessage<BlockHeader>>)> {
         trace!("Starting BlockSynchronizer...");
         let mut state_sync_tasks = FuturesUnordered::new();
         let mut synchronizers = self

tycho-client/src/stream.rs

@@ -12,7 +12,7 @@ use tycho_common::dto::{Chain, ExtractorIdentity, PaginationParams, ProtocolSyst
 use crate::{
     deltas::DeltasClient,
     feed::{
-        component_tracker::ComponentFilter, synchronizer::ProtocolStateSynchronizer,
+        component_tracker::ComponentFilter, synchronizer::ProtocolStateSynchronizer, BlockHeader,
         BlockSynchronizer, FeedMessage,
     },
     rpc::RPCClient,
@@ -132,7 +132,9 @@ impl TychoStreamBuilder {
 
     /// Builds and starts the Tycho client, connecting to the Tycho server and
     /// setting up the synchronization of exchange components.
-    pub async fn build(self) -> Result<(JoinHandle<()>, Receiver<FeedMessage>), StreamError> {
+    pub async fn build(
+        self,
+    ) -> Result<(JoinHandle<()>, Receiver<FeedMessage<BlockHeader>>), StreamError> {
         if self.exchanges.is_empty() {
             return Err(StreamError::SetUpError(
                 "At least one exchange must be registered.".to_string(),