refactor cli interface

.cargo/config.toml

@@ -1,5 +1,5 @@
 [alias]
-ordhook-install = "install --path components/ordhook-cli --locked --force"
+ordhook-install = "install --path components/cli --locked --force"
 
 [env]
 RUST_TEST_THREADS = "1"

.github/workflows/ci.yaml

@@ -122,10 +122,10 @@ jobs:
       fail-fast: false
       matrix:
         suite:
-          - ordhook-cli
-          - ordhook-core
+          - cli
           - chainhook-sdk
           - chainhook-postgres
+          - ordhook-core
     runs-on: ubuntu-latest
     defaults:
       run:

.vscode/launch.json

@@ -20,7 +20,7 @@
       "request": "launch",
       "name": "run: ordhook service",
       "cargo": {
-        "args": ["build", "--bin=ordhook", "--package=ordhook-cli"],
+        "args": ["build", "--bin=ordhook", "--package=cli"],
         "filter": {
           "name": "ordhook",
           "kind": "bin"
@@ -38,7 +38,7 @@
       "request": "launch",
       "name": "Debug unit tests in executable 'ordhook'",
       "cargo": {
-        "args": ["test", "--no-run", "--bin=ordhook", "--package=ordhook-cli"],
+        "args": ["test", "--no-run", "--bin=ordhook", "--package=cli"],
         "filter": {
           "name": "ordhook",
           "kind": "bin"

Cargo.toml

@@ -3,11 +3,11 @@ members = [
     "components/chainhook-sdk",
     "components/chainhook-postgres",
     "components/chainhook-types-rs",
-    "components/ordhook-cli",
+    "components/cli",
     "components/ordhook-core",
     "components/ord",
 ]
-default-members = ["components/ordhook-cli"]
+default-members = ["components/cli"]
 resolver = "2"
 
 [workspace.dependencies]

components/chainhook-sdk/src/indexer/bitcoin/mod.rs

@@ -9,9 +9,8 @@ use bitcoincore_rpc::jsonrpc::error::RpcError;
 use bitcoincore_rpc_json::GetRawTransactionResultVoutScriptPubKey;
 use chainhook_types::bitcoin::{OutPoint, TxIn, TxOut};
 use chainhook_types::{
-    BitcoinBlockData, BitcoinBlockMetadata, BitcoinBlockSignaling, BitcoinNetwork, 
-    BitcoinTransactionData,BitcoinTransactionMetadata, BlockHeader, BlockIdentifier, 
-    TransactionIdentifier,
+    BitcoinBlockData, BitcoinBlockMetadata, BitcoinNetwork, BitcoinTransactionData,
+    BitcoinTransactionMetadata, BlockHeader, BlockIdentifier, TransactionIdentifier,
 };
 use hiro_system_kit::slog;
 use reqwest::Client as HttpClient;

components/ordhook-cli/Cargo.toml → components/cli/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "ordhook-cli"
+name = "cli"
 version.workspace = true
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
-name = "ordhook"
+name = "bitcoin-indexer"
 path = "src/main.rs"
 
 [dependencies]