fix: loading predicates from redis

Author: Ludo Galabru

components/chainhook-cli/src/service/mod.rs

@@ -39,19 +39,33 @@ impl Service {
         Self { config, ctx }
     }
 
-    pub async fn run(
-        &mut self,
-        mut predicates: Vec<ChainhookFullSpecification>,
-    ) -> Result<(), String> {
+    pub async fn run(&mut self, predicates: Vec<ChainhookFullSpecification>) -> Result<(), String> {
         let mut chainhook_config = ChainhookConfig::new();
 
         if predicates.is_empty() {
-            let mut registered_predicates = load_predicates_from_redis(&self.config, &self.ctx)?;
-            predicates.append(&mut registered_predicates);
+            let registered_predicates = load_predicates_from_redis(&self.config, &self.ctx)?;
+            for predicate in registered_predicates.into_iter() {
+                let predicate_uuid = predicate.uuid().to_string();
+                match chainhook_config.register_specification(predicate) {
+                    Ok(_) => {
+                        info!(
+                            self.ctx.expect_logger(),
+                            "Predicate {} retrieved from storage and loaded", predicate_uuid,
+                        );
+                    }
+                    Err(e) => {
+                        error!(
+                            self.ctx.expect_logger(),
+                            "Failed loading predicate from storage: {}",
+                            e.to_string()
+                        );
+                    }
+                }
+            }
         }
 
         for predicate in predicates.into_iter() {
-            match chainhook_config.register_hook(
+            match chainhook_config.register_full_specification(
                 (
                     &self.config.network.bitcoin_network,
                     &self.config.network.stacks_network,
@@ -62,14 +76,14 @@ impl Service {
                 Ok(spec) => {
                     info!(
                         self.ctx.expect_logger(),
-                        "Predicate {} retrieved from storage and loaded",
+                        "Predicate {} retrieved from config and loaded",
                         spec.uuid(),
                     );
                 }
                 Err(e) => {
                     error!(
                         self.ctx.expect_logger(),
-                        "Failed loading predicate from storage: {}",
+                        "Failed loading predicate from config: {}",
                         e.to_string()
                     );
                 }
@@ -593,7 +607,7 @@ fn update_storage_with_confirmed_stacks_blocks(
 fn load_predicates_from_redis(
     config: &Config,
     ctx: &Context,
-) -> Result<Vec<ChainhookFullSpecification>, String> {
+) -> Result<Vec<ChainhookSpecification>, String> {
     let redis_config = config.expected_redis_config();
     let client = redis::Client::open(redis_config.uri.clone()).unwrap();
     let mut redis_con = match client.get_connection() {
@@ -619,7 +633,7 @@ fn load_predicates_from_redis(
     for key in chainhooks_to_load.iter() {
         let chainhook = match redis_con.hget::<_, _, String>(key, "specification") {
             Ok(spec) => {
-                ChainhookFullSpecification::deserialize_specification(&spec, key).unwrap()
+                ChainhookSpecification::deserialize_specification(&spec, key).unwrap()
                 // todo
             }
             Err(e) => {

components/chainhook-event-observer/src/chainhooks/types.rs

@@ -45,7 +45,7 @@ impl ChainhookConfig {
         bitcoin
     }
 
-    pub fn register_hook(
+    pub fn register_full_specification(
         &mut self,
         networks: (&BitcoinNetwork, &StacksNetwork),
         hook: ChainhookFullSpecification,
@@ -68,6 +68,18 @@ impl ChainhookConfig {
         Ok(spec)
     }
 
+    pub fn register_specification(&mut self, spec: ChainhookSpecification) -> Result<(), String> {
+        match spec {
+            ChainhookSpecification::Stacks(spec) => {
+                self.stacks_chainhooks.push(spec.clone());
+            }
+            ChainhookSpecification::Bitcoin(spec) => {
+                self.bitcoin_chainhooks.push(spec.clone());
+            }
+        };
+        Ok(())
+    }
+
     pub fn deregister_stacks_hook(
         &mut self,
         hook_uuid: String,

components/chainhook-event-observer/src/observer/mod.rs

@@ -1207,7 +1207,9 @@ pub async fn start_observer_commands_handler(
                         }
                     };
 
-                    let spec = match hook_formation.register_hook(networks, hook, &api_key) {
+                    let spec = match hook_formation
+                        .register_full_specification(networks, hook, &api_key)
+                    {
                         Ok(uuid) => uuid,
                         Err(e) => {
                             ctx.try_log(|logger| {