fix: Fix config point parsing regression (#17)

src/crosscut/args.rs

@@ -1,6 +1,6 @@
 use pallas::network::miniprotocols::{Point, MAINNET_MAGIC, TESTNET_MAGIC};
 use serde::{Deserialize, Serialize};
-use std::{fmt::Display, ops::Deref, str::FromStr};
+use std::{ops::Deref, str::FromStr};
 
 use crate::Error;
 
@@ -106,8 +106,37 @@ impl Default for MagicArg {
 pub enum IntersectConfig {
     Tip,
     Origin,
-    Point(PointArg),
-    Fallbacks(Vec<PointArg>),
+    Point(u64, String),
+    Fallbacks(Vec<(u64, String)>),
+}
+
+impl IntersectConfig {
+    pub fn get_point(&self) -> Option<Point> {
+        match self {
+            IntersectConfig::Point(slot, hash) => {
+                let hash = hex::decode(hash).expect("valid hex hash");
+                Some(Point::Specific(*slot, hash))
+            }
+            _ => None,
+        }
+    }
+
+    pub fn get_fallbacks(&self) -> Option<Vec<Point>> {
+        match self {
+            IntersectConfig::Fallbacks(all) => {
+                let mapped = all
+                    .iter()
+                    .map(|(slot, hash)| {
+                        let hash = hex::decode(hash).expect("valid hex hash");
+                        Point::Specific(*slot, hash)
+                    })
+                    .collect();
+
+                Some(mapped)
+            }
+            _ => None,
+        }
+    }
 }
 
 /// Well-known information about the blockhain network

src/sources/utils.rs

@@ -73,13 +73,13 @@ pub fn define_known_points(
             let tip = find_end_of_chain(chain, channel)?;
             Ok(Some(vec![tip]))
         }
-        crosscut::IntersectConfig::Point(x) => {
-            let point = x.clone().try_into()?;
+        crosscut::IntersectConfig::Point(_, _) => {
+            let point = intersect.get_point().expect("point value");
             Ok(Some(vec![point]))
         }
-        crosscut::IntersectConfig::Fallbacks(x) => {
-            let points: Result<Vec<_>, _> = x.iter().cloned().map(|x| x.try_into()).collect();
-            Ok(Some(points?))
+        crosscut::IntersectConfig::Fallbacks(_) => {
+            let points = intersect.get_fallbacks().expect("fallback values");
+            Ok(Some(points))
         }
     }
 }

testdrive/custom/docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3.7"
+
+services:
+  redis:
+    image: redis
+    volumes:
+      - ./data:/data
+    ports:
+      - "6379:6379"

testdrive/custom/start.sh

@@ -0,0 +1 @@
+RUST_LOG=info cargo run --all-features --bin scrolls -- daemon --config ./daemon.toml