[fix] move from_json_file back to prover crate (#1350)

* move from_json_file back to prover crate

* fix test

Author: lightsing

Cargo.lock

@@ -12,8 +12,7 @@ halo2curves.workspace = true
 log.workspace = true
 regex.workspace = true
 serde.workspace = true
-serde_json = { workspace = true, features = ["unbounded_depth"] }
-serde_stacker.workspace = true
+serde_json.workspace = true
 serde_with = "1.12"
 uint = "0.9.1"
 itertools.workspace = true

eth-types/Cargo.toml

@@ -536,15 +536,3 @@ pub struct AccountTrace {
     #[serde(rename = "codeSize")]
     pub code_size: u64,
 }
-
-#[ignore]
-#[test]
-fn test_block_trace_convert() {
-    let trace_v1: BlockTrace =
-        crate::utils::from_json_file("src/testdata/trace_v1_5224657.json").expect("should load");
-    let trace_v2: BlockTraceV2 = trace_v1.into();
-    let mut fd = std::fs::File::create("src/testdata/trace_v2_5224657.json").unwrap();
-    serde_json::to_writer_pretty(&mut fd, &trace_v2).unwrap();
-    // then we can use this command to compare the traces:
-    // vimdiff <(jq -S "del(.executionResults)|del(.txStorageTraces)" src/testdata/trace_v1_5224657.json) <(jq -S . src/testdata/trace_v2_5224657.json)
-}

eth-types/src/l2_types.rs

@@ -3,8 +3,6 @@
 use crate::Address;
 use revm_precompile::Precompiles;
 
-mod io;
-pub use io::*;
 mod codehash;
 pub use codehash::*;
 

eth-types/src/utils.rs

@@ -12,6 +12,19 @@ use std::{
     path::{Path, PathBuf},
 };
 
+pub fn from_json_file<'de, P: serde::Deserialize<'de>>(file_path: &str) -> anyhow::Result<P> {
+    if !Path::new(&file_path).exists() {
+        anyhow::bail!("File {file_path} doesn't exist");
+    }
+
+    let fd = File::open(file_path)?;
+    let mut deserializer = serde_json::Deserializer::from_reader(fd);
+    deserializer.disable_recursion_limit();
+    let deserializer = serde_stacker::Deserializer::new(&mut deserializer);
+
+    Ok(serde::Deserialize::deserialize(deserializer)?)
+}
+
 pub fn serialize_fr(f: &Fr) -> Vec<u8> {
     f.to_bytes().to_vec()
 }
@@ -127,3 +140,15 @@ pub fn load_instances(buf: &[u8]) -> Vec<Vec<Vec<Fr>>> {
         })
         .collect()
 }
+
+#[ignore]
+#[test]
+fn test_block_trace_convert() {
+    let trace_v1: eth_types::l2_types::BlockTrace =
+        from_json_file("src/testdata/trace_v1_5224657.json").expect("should load");
+    let trace_v2: eth_types::l2_types::BlockTraceV2 = trace_v1.into();
+    let mut fd = std::fs::File::create("src/testdata/trace_v2_5224657.json").unwrap();
+    serde_json::to_writer_pretty(&mut fd, &trace_v2).unwrap();
+    // then we can use this command to compare the traces:
+    // vimdiff <(jq -S "del(.executionResults)|del(.txStorageTraces)" src/testdata/trace_v1_5224657.json) <(jq -S . src/testdata/trace_v2_5224657.json)
+}

eth-types/src/utils/io.rs

@@ -113,7 +113,7 @@ pub fn dump_vk(dir: &str, filename: &str, raw_vk: &[u8]) {
 
 pub fn from_json_file<'de, P: serde::Deserialize<'de>>(dir: &str, filename: &str) -> Result<P> {
     let file_path = dump_proof_path(dir, filename);
-    Ok(eth_types::utils::from_json_file(&file_path)?)
+    crate::io::from_json_file(&file_path)
 }
 
 fn dump_proof_path(dir: &str, filename: &str) -> String {