refactor: remove the redundant tip field in ClientForward

Signed-off-by: etorreborre <etorreborre@yahoo.com>

Author: etorreborre

crates/amaru/src/stages/consensus/forward_chain.rs

@@ -134,10 +134,8 @@ impl Worker {
                     "tip_changed"
                 );
 
-                self.clients.send(ClientMsg::Op(ClientOp::Forward(
-                    header.clone(),
-                    self.our_tip.clone(),
-                )));
+                self.clients
+                    .send(ClientMsg::Op(ClientOp::Forward(header.clone())));
 
                 stage
                     .downstream
@@ -188,7 +186,7 @@ enum ClientOp {
     /// the tip to go back to
     Backward(Tip),
     /// the header to go forward to and the tip we will be at after sending this header
-    Forward(Header, Tip),
+    Forward(Header),
 }
 
 impl std::fmt::Debug for ClientOp {
@@ -198,13 +196,16 @@ impl std::fmt::Debug for ClientOp {
                 .debug_struct("Backward")
                 .field("tip", &(tip.1, PrettyPoint(&tip.0)))
                 .finish(),
-            Self::Forward(header, tip) => f
+            Self::Forward(header) => f
                 .debug_struct("Forward")
                 .field(
                     "header",
                     &(header.block_height(), PrettyPoint(&header.pallas_point())),
                 )
-                .field("tip", &(tip.1, PrettyPoint(&tip.0)))
+                .field(
+                    "tip",
+                    &(header.as_tip().1, PrettyPoint(&header.pallas_point())),
+                )
                 .finish(),
         }
     }
@@ -234,9 +235,7 @@ impl PartialEq for ClientOp {
     fn eq(&self, other: &Self) -> bool {
         match (self, other) {
             (Self::Backward(l0), Self::Backward(r0)) => (&l0.0, l0.1) == (&r0.0, r0.1),
-            (Self::Forward(l0, l1), Self::Forward(r0, r1)) => {
-                l0 == r0 && (&l1.0, l1.1) == (&r1.0, r1.1)
-            }
+            (Self::Forward(l0), Self::Forward(r0)) => l0 == r0,
             _ => false,
         }
     }
@@ -248,7 +247,7 @@ impl ClientOp {
     pub fn tip(&self) -> Tip {
         match self {
             ClientOp::Backward(tip) => tip.clone(),
-            ClientOp::Forward(_, tip) => tip.clone(),
+            ClientOp::Forward(header) => header.as_tip(),
         }
     }
 }

crates/amaru/src/stages/consensus/forward_chain/client_protocol.rs

@@ -179,7 +179,7 @@ async fn chain_sync_handler(
 
         if let ActoInput::Message(op) = cell.recv().await {
             match op {
-                Some((ClientOp::Forward(header, _), tip)) => {
+                Some((ClientOp::Forward(header), tip)) => {
                     tracing::debug!("sending roll forward");
                     server
                         .send_roll_forward(to_header_content(header), tip)
@@ -196,7 +196,7 @@ async fn chain_sync_handler(
                         return Ok(());
                     };
                     match op {
-                        ClientOp::Forward(header, _) => {
+                        ClientOp::Forward(header) => {
                             server
                                 .send_roll_forward(to_header_content(header), tip)
                                 .await?;

crates/amaru/src/stages/consensus/forward_chain/client_state.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use super::{ClientOp, hash_point};
-use crate::stages::AsTip;
+use crate::stages::{AsTip, PallasPoint};
 use amaru_kernel::Header;
 use amaru_ouroboros_traits::{ChainStore, IsHeader};
 use pallas_network::miniprotocols::{Point, chainsync::Tip};
@@ -44,7 +44,7 @@ impl ClientState {
             ClientOp::Backward(tip) => {
                 if let Some((index, _)) =
                     self.ops.iter().enumerate().rfind(
-                        |(_, op)| matches!(op, ClientOp::Forward(_, tip2) if tip2.0 == tip.0),
+                        |(_, op)| matches!(op, ClientOp::Forward(header2) if header2.pallas_point() == tip.0),
                     )
                 {
                     tracing::debug!("found backward op at index {index} in {:?}", self.ops);
@@ -81,10 +81,7 @@ pub(super) fn find_headers_between(
 
     // Find the first point that is in the past of start_point
     let mut current_header = start_header;
-    let mut headers = vec![ClientOp::Forward(
-        current_header.clone(),
-        current_header.as_tip(),
-    )];
+    let mut headers = vec![ClientOp::Forward(current_header.clone())];
 
     while let Some(parent_hash) = current_header.parent() {
         match store.load_header(&parent_hash) {
@@ -94,7 +91,7 @@ pub(super) fn find_headers_between(
                     headers.reverse();
                     return Some((headers, header.as_tip()));
                 }
-                headers.push(ClientOp::Forward(header.clone(), header.as_tip()));
+                headers.push(ClientOp::Forward(header.clone()));
                 current_header = header;
             }
             None => return None, // Broken chain