small fixes and add the n2c to the workspace properly

Cargo.toml

@@ -6,7 +6,7 @@ members = [
     "fraos",
     "indexed-log-map",
     "multiverse",
-    "cardano-cli-tools/oura-block-fetcher",
+    "cardano-cli-tools/n2c-fetcher",
     "cardano-cli-tools/cardano-net-fetcher",
 ]
 exclude = [

blockchain-source/src/cardano/mod.rs

@@ -330,7 +330,11 @@ async fn block_fetch(
             },
         }
     } else {
-        todo!();
+        // this is probably impossible, but handle it as an error just in case
+        return Err(anyhow::anyhow!(
+            "Unexpected point in Rollbackward immediately after doing an intersect request"
+        )
+        .context(critical_error!()));
     };
 
     let (slot, hash) = match raw_header.variant {

cardano-cli-tools/n2c-fetcher/Cargo.toml

@@ -11,3 +11,4 @@ clap = { version = "4.3.0", features = ["derive"] }
 tokio = { version = "1.25.0", features = ["full"] }
 dcspark-core = { path = "../../core" }
 dcspark-blockchain-source = { path = "../../blockchain-source" }
+hex = { version = "0.4.3" }

cardano-cli-tools/n2c-fetcher/README.md

@@ -1,13 +1,2 @@
-# Oura block fetcher
-
-The tool is needed to fetch Cardano blocks from oura with raw cbor. Example:
-```shell
- cargo run --bin oura-block-fetcher  -- --bearer tcp --since 94542168,9a585e847251b8e1eb41130c53506f3a5ef60213478af4b42b4477f884f86a59 --socket relays-new.cardano-mainnet.iohk.io:3001
-```
-# Configuration
-There are multiple parameters:
-* `bearer -- either tcp or unix` - represents the connection type to the node (tcp web / unix socket)
-* `since -- slot,block_hash` - starting point
-* `socket -- relays-new.cardano-mainnet.iohk.io:3001` - url or path to cardano node unix socket
-* `network -- mainnet / testnet / preview / preprod` - network of interest
-
+# Example
+`cargo run --bin n2c-fetcher  -- --unix_socket socket_path --since 94542168,9a585e847251b8e1eb41130c53506f3a5ef60213478af4b42b4477f884f86a59`

cardano-cli-tools/n2c-fetcher/src/main.rs

@@ -50,7 +50,21 @@ async fn main() -> anyhow::Result<()> {
     let mut source = N2CSource::connect(base_config, start_from).await?;
 
     while let Ok(Some(block)) = source.pull(&()).await {
-        println!("{:?}", block);
+        match block {
+            dcspark_blockchain_source::cardano::N2CSourceEvent::RollBack {
+                block_slot,
+                block_hash,
+            } => {}
+            dcspark_blockchain_source::cardano::N2CSourceEvent::Block(block) => {
+                println!(
+                    "Block #{}, point: {}@{}, raw cbor hex: {}",
+                    block.block_number,
+                    block.id,
+                    block.slot_number,
+                    hex::encode(block.raw_block),
+                );
+            }
+        }
     }
 
     Ok(())