simplify trigger matches

Author: reecepbcups

components/eth-price-oracle/src/lib.rs

@@ -1,6 +1,5 @@
 mod trigger;
-use bindings::wavs::worker::layer_types::{TriggerData, TriggerSource};
-use trigger::{decode_trigger_event, encode_trigger_output};
+use trigger::{decode_trigger_event, encode_trigger_output, Destination};
 pub mod bindings;
 use crate::bindings::{export, Guest, TriggerAction};
 use serde::{Deserialize, Serialize};
@@ -14,22 +13,9 @@ struct Component;
 export!(Component with_types_in bindings);
 
 impl Guest for Component {
-    fn run(trigger_action: TriggerAction) -> std::result::Result<Vec<u8>, String> {
-        enum Destination {
-            Ethereum,
-            CliOutput
-        }
-        let ((trigger_id, req), dest) = match &trigger_action.data {
-            // When the trigger comes from WAVS, it's from an ethereum contract event
-            TriggerData::EthContractEvent(_) => {
-                (decode_trigger_event(trigger_action.data).map_err(|e| e.to_string())?, Destination::Ethereum)
-            },
-            // When we test in a CLI exec command, it's just raw bytes (we can make-up the trigger_id)
-            TriggerData::Raw(data) => ((0, data.clone()), Destination::CliOutput),
-            TriggerData::CosmosContractEvent(_) => {
-                return Err("Unsupported trigger data type".to_string());
-            },
-        };
+    fn run(action: TriggerAction) -> std::result::Result<Vec<u8>, String> {
+        let (trigger_id, req, dest) =
+            decode_trigger_event(action.data).map_err(|e| e.to_string())?;
 
         // Convert bytes to string and parse first char as u64
         let input = std::str::from_utf8(&req).map_err(|e| e.to_string())?;
@@ -53,9 +39,7 @@ impl Guest for Component {
 
         match res {
             Ok(data) => match dest {
-                Destination::Ethereum => {
-                    Ok(encode_trigger_output(trigger_id, &data))
-                },
+                Destination::Ethereum => Ok(encode_trigger_output(trigger_id, &data)),
                 Destination::CliOutput => Ok(data),
             },
             Err(e) => Err(e),

components/eth-price-oracle/src/trigger.rs

@@ -1,19 +1,21 @@
-// Helpers to work with "trigger id" flows - which our example components do
 use crate::bindings::wavs::worker::layer_types::{TriggerData, TriggerDataEthContractEvent};
 use alloy_sol_types::SolValue;
 use anyhow::Result;
+use wavs_wasi_chain::decode_event_log_data;
 
-pub fn decode_trigger_event(trigger_data: TriggerData) -> Result<(u64, Vec<u8>)> {
+pub enum Destination {
+    Ethereum,
+    CliOutput,
+}
+
+pub fn decode_trigger_event(trigger_data: TriggerData) -> Result<(u64, Vec<u8>, Destination)> {
     match trigger_data {
         TriggerData::EthContractEvent(TriggerDataEthContractEvent { log, .. }) => {
-            let event: solidity::NewTrigger = wavs_wasi_chain::decode_event_log_data!(log)?;
+            let event: solidity::NewTrigger = decode_event_log_data!(log)?;
             let trigger_info = solidity::TriggerInfo::abi_decode(&event._0, false)?;
-            Ok((trigger_info.triggerId, trigger_info.data.to_vec()))
-        }
-        TriggerData::Raw(data) => {
-            let trigger_info = solidity::TriggerInfo::abi_decode(&data, false)?;
-            Ok((trigger_info.triggerId, data.to_vec()))
+            Ok((trigger_info.triggerId, trigger_info.data.to_vec(), Destination::Ethereum))
         }
+        TriggerData::Raw(data) => Ok((0, data.clone(), Destination::CliOutput)),
         _ => Err(anyhow::anyhow!("Unsupported trigger data type")),
     }
 }