Merge pull request #6737 from jacinta-stacks/chore/remove-needless-result-wrapping-in-shallow-merge

Remove needless Result from TupleData::shallow_merge

Author: jacinta-stacks

clarity-types/src/types/mod.rs

@@ -1638,10 +1638,7 @@ impl TupleData {
         })
     }
 
-    pub fn shallow_merge(
-        mut base: TupleData,
-        updates: TupleData,
-    ) -> Result<TupleData, VmExecutionError> {
+    pub fn shallow_merge(mut base: TupleData, updates: TupleData) -> TupleData {
         let TupleData {
             data_map,
             mut type_signature,
@@ -1650,7 +1647,7 @@ impl TupleData {
             base.data_map.insert(name, value);
         }
         base.type_signature.shallow_merge(&mut type_signature);
-        Ok(base)
+        base
     }
 }
 

clarity/src/vm/functions/tuples.rs

@@ -97,6 +97,6 @@ pub fn tuple_merge(base: Value, update: Value) -> Result<Value, VmExecutionError
         ))),
     }?;
 
-    let combined = TupleData::shallow_merge(initial_values, new_values)?;
+    let combined = TupleData::shallow_merge(initial_values, new_values);
     Ok(Value::Tuple(combined))
 }

pox-locking/src/events.rs

@@ -678,11 +678,7 @@ fn inner_synthesize_pox_event_info(
                 let data_tuple = data_event_info
                     .expect_tuple()
                     .expect("FATAL: unexpected clarity value");
-                let event_tuple =
-                    TupleData::shallow_merge(base_event_tuple, data_tuple).map_err(|e| {
-                        error!("Failed to merge data-info and event-info: {e:?}");
-                        e
-                    })?;
+                let event_tuple = TupleData::shallow_merge(base_event_tuple, data_tuple);
 
                 Ok(Value::Tuple(event_tuple))
             },

pox-locking/src/events_24.rs

@@ -410,11 +410,7 @@ pub fn synthesize_pox_2_or_3_event_info(
                 let data_tuple = data_event_info
                     .expect_tuple()
                     .expect("FATAL: unexpected clarity value");
-                let event_tuple =
-                    TupleData::shallow_merge(base_event_tuple, data_tuple).map_err(|e| {
-                        error!("Failed to merge data-info and event-info: {e:?}");
-                        e
-                    })?;
+                let event_tuple = TupleData::shallow_merge(base_event_tuple, data_tuple);
 
                 Ok(Value::Tuple(event_tuple))
             },