rename ChainhookConfig -> ChainhookStore

remove unnecessary wrapper around ChainhookStore
hirosystems · Jun 24, 2024 · c54b6e7 · c54b6e7
1 parent 4debc28
commit c54b6e7
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 110 deletions.
diff --git a/components/chainhook-cli/src/config/mod.rs b/components/chainhook-cli/src/config/mod.rs
@@ -1,6 +1,7 @@
 pub mod file;
 pub mod generator;
 
+use chainhook_sdk::chainhooks::types::ChainhookStore;
 pub use chainhook_sdk::indexer::IndexerConfig;
 use chainhook_sdk::observer::EventObserverConfig;
 use chainhook_sdk::types::{
@@ -114,7 +115,7 @@ impl Config {
     pub fn get_event_observer_config(&self) -> EventObserverConfig {
         EventObserverConfig {
             bitcoin_rpc_proxy_enabled: true,
-            chainhook_config: None,
+            registered_chainhooks: ChainhookStore::new(),
             bitcoind_rpc_username: self.network.bitcoind_rpc_username.clone(),
             bitcoind_rpc_password: self.network.bitcoind_rpc_password.clone(),
             bitcoind_rpc_url: self.network.bitcoind_rpc_url.clone(),

diff --git a/components/chainhook-cli/src/service/mod.rs b/components/chainhook-cli/src/service/mod.rs
@@ -11,7 +11,7 @@ use crate::storage::{
     open_readwrite_stacks_db_conn,
 };
 
-use chainhook_sdk::chainhooks::types::{ChainhookConfig, ChainhookSpecificationNetworkMap};
+use chainhook_sdk::chainhooks::types::{ChainhookSpecificationNetworkMap, ChainhookStore};
 
 use chainhook_sdk::chainhooks::types::ChainhookInstance;
 use chainhook_sdk::observer::{
@@ -42,7 +42,7 @@ impl Service {
         predicates_from_startup: Vec<ChainhookSpecificationNetworkMap>,
         observer_commands_tx_rx: Option<(Sender<ObserverCommand>, Receiver<ObserverCommand>)>,
     ) -> Result<(), String> {
-        let mut chainhook_config = ChainhookConfig::new();
+        let mut chainhook_store = ChainhookStore::new();
 
         // store all predicates from Redis that were in the process of scanning when
         // chainhook was shutdown - we need to resume where we left off
@@ -87,7 +87,7 @@ impl Service {
                         continue;
                     }
                 }
-                match chainhook_config.register_instance(predicate) {
+                match chainhook_store.register_instance(predicate) {
                     Ok(_) => {
                         debug!(
                             self.ctx.expect_logger(),
@@ -128,7 +128,7 @@ impl Service {
                     }
                 };
             }
-            match chainhook_config.register_instance_from_network_map(
+            match chainhook_store.register_instance_from_network_map(
                 (
                     &self.config.network.bitcoin_network,
                     &self.config.network.stacks_network,
@@ -159,7 +159,7 @@ impl Service {
         // let (ordinal_indexer_command_tx, ordinal_indexer_command_rx) = channel();
 
         let mut event_observer_config = self.config.get_event_observer_config();
-        event_observer_config.chainhook_config = Some(chainhook_config);
+        event_observer_config.registered_chainhooks = chainhook_store;
 
         // Download and ingest a Stacks dump
         if self.config.rely_on_remote_stacks_tsv() {

diff --git a/components/chainhook-cli/src/service/tests/observer_tests.rs b/components/chainhook-cli/src/service/tests/observer_tests.rs
@@ -1,6 +1,7 @@
 use std::{sync::mpsc::channel, thread::sleep, time::Duration};
 
 use chainhook_sdk::{
+    chainhooks::types::ChainhookStore,
     observer::{start_event_observer, EventObserverConfig},
     types::{BitcoinNetwork, StacksNodeConfig},
     utils::Context,
@@ -188,7 +189,7 @@ async fn it_responds_200_for_unimplemented_endpoints(
         panic!("test failed with error: {e}");
     });
     let config = EventObserverConfig {
-        chainhook_config: None,
+        registered_chainhooks: ChainhookStore::new(),
         bitcoin_rpc_proxy_enabled: false,
         bitcoind_rpc_username: format!(""),
         bitcoind_rpc_password: format!(""),

diff --git a/components/chainhook-sdk/src/chainhooks/types.rs b/components/chainhook-sdk/src/chainhooks/types.rs
@@ -13,14 +13,14 @@ use crate::chainhooks::stacks::StacksChainhookInstance;
 use crate::chainhooks::stacks::StacksChainhookSpecificationNetworkMap;
 
 #[derive(Deserialize, Debug, Clone)]
-pub struct ChainhookConfig {
+pub struct ChainhookStore {
     pub stacks_chainhooks: Vec<StacksChainhookInstance>,
     pub bitcoin_chainhooks: Vec<BitcoinChainhookInstance>,
 }
 
-impl ChainhookConfig {
-    pub fn new() -> ChainhookConfig {
-        ChainhookConfig {
+impl ChainhookStore {
+    pub fn new() -> ChainhookStore {
+        ChainhookStore {
             stacks_chainhooks: vec![],
             bitcoin_chainhooks: vec![],
         }
@@ -137,7 +137,7 @@ impl ChainhookConfig {
     }
 }
 
-impl Serialize for ChainhookConfig {
+impl Serialize for ChainhookStore {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,