simplify error

Author: diegomrsantos

anchor/eth/src/error.rs

@@ -10,8 +10,8 @@ pub enum ExecutionError {
 
     #[error("Invalid event for operator {operator_id:?} (owner: {owner:?}): {message}")]
     InvalidOperatorEvent {
-        operator_id: Option<ssv_types::OperatorId>,
-        owner: Option<alloy::primitives::Address>,
+        operator_id: ssv_types::OperatorId,
+        owner: alloy::primitives::Address,
         message: String,
         #[source]
         source: Option<Box<dyn std::error::Error + Send + Sync>>,
@@ -68,8 +68,8 @@ pub enum ExecutionError {
 
 impl ExecutionError {
     pub fn invalid_operator_event(
-        operator_id: Option<ssv_types::OperatorId>,
-        owner: Option<alloy::primitives::Address>,
+        operator_id: ssv_types::OperatorId,
+        owner: alloy::primitives::Address,
         message: impl Into<String>,
         source: Option<Box<dyn std::error::Error + Send + Sync>>,
     ) -> Self {

anchor/eth/src/event_processor.rs

@@ -161,8 +161,8 @@ impl EventProcessor {
         // Confirm that this operator does not already exist
         if self.db.state().operator_exists(&operator_id) {
             return Err(ExecutionError::invalid_operator_event(
-                Some(operator_id),
-                Some(owner),
+                operator_id,
+                owner,
                 format!("Operator with id {operator_id:?} already exists in database"),
                 None,
             ));
@@ -173,8 +173,8 @@ impl EventProcessor {
         let public_key_str = public_key_str.trim_start_matches("0x");
         let data = hex::decode(public_key_str).map_err(|e| {
             ExecutionError::invalid_operator_event(
-                Some(operator_id),
-                Some(owner),
+                operator_id,
+                owner,
                 "Failed to decode public key data from hex",
                 Some(Box::new(e)),
             )
@@ -185,8 +185,8 @@ impl EventProcessor {
             let data = &data[64..];
             let data = String::from_utf8(data.to_vec()).map_err(|e| {
                 ExecutionError::invalid_operator_event(
-                    Some(operator_id),
-                    Some(owner),
+                    operator_id,
+                    owner,
                     "Failed to convert to UTF8 String",
                     Some(Box::new(e)),
                 )
@@ -195,8 +195,8 @@ impl EventProcessor {
         } else {
             String::from_utf8(data.to_vec()).map_err(|e| {
                 ExecutionError::invalid_operator_event(
-                    Some(operator_id),
-                    Some(owner),
+                    operator_id,
+                    owner,
                     "Failed to convert to UTF8 String",
                     Some(Box::new(e)),
                 )
@@ -206,8 +206,8 @@ impl EventProcessor {
         // Construct the Operator and insert it into the database
         let operator = Operator::new(&data, operator_id, owner).map_err(|e| {
             ExecutionError::invalid_operator_event(
-                Some(operator_id),
-                Some(owner),
+                operator_id,
+                owner,
                 "Failed to construct operator",
                 Some(Box::new(e)),
             )