apply rabbit comments

Signed-off-by: Roland Kuhn <rk@rkuhn.info>

Author: rkuhn

.gitignore

@@ -23,8 +23,7 @@ target/
 *.snap.new
 
 # Files downloaded for the demo
-snapshots/
-!crates/amaru/tests/snapshots
+/snapshots/
 
 # Files for local coverage reports
 coverage/
@@ -39,4 +38,3 @@ coverage/
 
 # Cardano node support files
 /cardano-node-config/
-/snapshots/

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

@@ -50,10 +50,9 @@ impl ClientState {
 }
 
 /// Find headers between points in the chain store.
-/// Returns None if none of the points in `points` lies in the past of `start_point`.
+/// Returns None if the local chain is broken.
 /// Otherwise returns Some(headers) where headers is a list of headers leading from
-/// the first found point in the past of `start_point` matching a point from `points`
-/// up to `start_point`.
+/// the tallest point from the list that lies in the past of `start_point`.
 pub(super) fn find_headers_between(
     store: &dyn ChainStore<Header>,
     start_point: &Point,

crates/amaru/src/stages/mod.rs

@@ -32,7 +32,10 @@ use gasket::{
     messaging::{tokio::funnel_ports, OutputPort},
     runtime::Tether,
 };
-use pallas_network::{facades::PeerClient, miniprotocols::chainsync::Tip};
+use pallas_network::{
+    facades::PeerClient,
+    miniprotocols::{chainsync::Tip, Point},
+};
 use std::{path::PathBuf, sync::Arc};
 use tokio::sync::Mutex;
 
@@ -90,11 +93,15 @@ pub fn bootstrap(
         .collect::<Vec<_>>();
     let chain_store = RocksDBStore::new(config.chain_dir.clone(), era_history)?;
 
-    #[allow(clippy::expect_used)]
-    let header: Header = chain_store
-        .load_header(&Hash::from(&tip))
-        .expect("Tip not found");
-    let our_tip = Tip(header.pallas_point(), header.block_height());
+    let our_tip = if let amaru_kernel::Point::Specific(_slot, hash) = &tip {
+        #[allow(clippy::expect_used)]
+        let header: Header = chain_store
+            .load_header(&Hash::from(&**hash))
+            .expect("Tip not found");
+        Tip(header.pallas_point(), header.block_height())
+    } else {
+        Tip(Point::Origin, 0)
+    };
 
     let chain_selector = make_chain_selector(tip.clone(), &chain_store, &peer_sessions)?;
     let chain_ref = Arc::new(Mutex::new(chain_store));