fix: code adjustment

Author: Gumichocopengin8

src/tracing/js/bindings.rs

@@ -1142,10 +1142,8 @@ mod tests {
 
         let obj = res.as_object().unwrap();
 
-        let result_fn =
-            obj.get(js_string!("result"), &mut context).unwrap().as_object().cloned().unwrap();
-        let setup_fn =
-            obj.get(js_string!("setup"), &mut context).unwrap().as_object().cloned().unwrap();
+        let result_fn = obj.get(js_string!("result"), &mut context).unwrap().as_object().unwrap();
+        let setup_fn = obj.get(js_string!("setup"), &mut context).unwrap().as_object().unwrap();
 
         let db = CacheDB::new(EmptyDB::new());
         let state = EvmState::default();
@@ -1184,10 +1182,8 @@ mod tests {
 
         let obj = eval.as_object().unwrap();
 
-        let result_fn =
-            obj.get(js_string!("result"), &mut context).unwrap().as_object().cloned().unwrap();
-        let step_fn =
-            obj.get(js_string!("step"), &mut context).unwrap().as_object().cloned().unwrap();
+        let result_fn = obj.get(js_string!("result"), &mut context).unwrap().as_object().unwrap();
+        let step_fn = obj.get(js_string!("step"), &mut context).unwrap().as_object().unwrap();
 
         let mut stack = Stack::new();
         let _ = stack.push(U256::from(35000));
@@ -1276,10 +1272,8 @@ mod tests {
 
         let obj = eval.as_object().unwrap();
 
-        let result_fn =
-            obj.get(js_string!("result"), &mut context).unwrap().as_object().cloned().unwrap();
-        let step_fn =
-            obj.get(js_string!("step"), &mut context).unwrap().as_object().cloned().unwrap();
+        let result_fn = obj.get(js_string!("result"), &mut context).unwrap().as_object().unwrap();
+        let step_fn = obj.get(js_string!("step"), &mut context).unwrap().as_object().unwrap();
 
         let mut stack = Stack::new();
         let _ = stack.push(U256::from(35000));

src/tracing/js/builtins.rs

@@ -34,7 +34,11 @@ pub(crate) fn to_serde_value(val: JsValue, ctx: &mut Context) -> JsResult<serde_
             )
         })
     } else {
-        val.to_json(ctx)
+        val.to_json(ctx)?.ok_or_else(|| {
+            JsError::from_native(
+                JsNativeError::error().with_message("failed to convert JsValue to JSON"),
+            )
+        })
     }
 }
 
@@ -94,7 +98,7 @@ pub(crate) fn register_builtins(ctx: &mut Context) -> JsResult<()> {
 
 /// Converts an array, hex string or Uint8Array to a byte array.
 pub(crate) fn bytes_from_value(val: JsValue, context: &mut Context) -> JsResult<Vec<u8>> {
-    if let Some(obj) = val.as_object().cloned() {
+    if let Some(obj) = val.as_object().into_iter().next() {
         if obj.is::<TypedArray>() {
             let array: JsTypedArray = JsTypedArray::from_object(obj)?;
             let len = array.length(context)?;
@@ -126,7 +130,7 @@ pub(crate) fn bytes_from_value(val: JsValue, context: &mut Context) -> JsResult<
     }
 
     if let Some(js_string) = val.as_string() {
-        return hex_decode_js_string(js_string);
+        return hex_decode_js_string(&js_string);
     }
 
     Err(JsError::from_native(

src/tracing/js/mod.rs

@@ -136,14 +136,13 @@ impl JsInspector {
         let obj =
             ctx.eval(Source::from_bytes(code.as_bytes())).map_err(JsInspectorError::EvalCode)?;
 
-        let obj = obj.as_object().cloned().ok_or(JsInspectorError::ExpectedJsObject)?;
+        let obj = obj.as_object().ok_or(JsInspectorError::ExpectedJsObject)?;
 
         // ensure all the fields are callables, if present
 
         let result_fn = obj
             .get(js_string!("result"), &mut ctx)?
             .as_object()
-            .cloned()
             .ok_or(JsInspectorError::ResultFunctionMissing)?;
         if !result_fn.is_callable() {
             return Err(JsInspectorError::ResultFunctionMissing);
@@ -152,21 +151,17 @@ impl JsInspector {
         let fault_fn = obj
             .get(js_string!("fault"), &mut ctx)?
             .as_object()
-            .cloned()
             .ok_or(JsInspectorError::FaultFunctionMissing)?;
         if !fault_fn.is_callable() {
             return Err(JsInspectorError::FaultFunctionMissing);
         }
 
-        let enter_fn = obj
-            .get(js_string!("enter"), &mut ctx)?
-            .as_object()
-            .cloned()
-            .filter(|o| o.is_callable());
+        let enter_fn =
+            obj.get(js_string!("enter"), &mut ctx)?.as_object().filter(|o| o.is_callable());
         let exit_fn =
-            obj.get(js_string!("exit"), &mut ctx)?.as_object().cloned().filter(|o| o.is_callable());
+            obj.get(js_string!("exit"), &mut ctx)?.as_object().filter(|o| o.is_callable());
         let step_fn =
-            obj.get(js_string!("step"), &mut ctx)?.as_object().cloned().filter(|o| o.is_callable());
+            obj.get(js_string!("step"), &mut ctx)?.as_object().filter(|o| o.is_callable());
 
         let _js_config_value =
             JsValue::from_json(&config, &mut ctx).map_err(JsInspectorError::InvalidJsonConfig)?;
@@ -986,12 +981,12 @@ mod tests {
                 this.res.push(toHex(slice(hex, 0, 2)));
                 this.res.push(toHex(slice(hex, 2, 4)));
                 this.res.push(toHex(slice(hex, 4, 6)));
-                
+
                 // Test slicing an array
                 var arr = [0x01, 0x02, 0x03, 0x04, 0x05];
                 this.res.push(toHex(slice(arr, 0, 3)));
                 this.res.push(toHex(slice(arr, 1, 4)));
-                
+
                 // Test slicing a Uint8Array
                 var uint8 = new Uint8Array([0xff, 0xee, 0xdd, 0xcc, 0xbb]);
                 this.res.push(toHex(slice(uint8, 0, 2)));