Refactor parsing to function

Author: xqft

operator/mina/lib/src/pickles_preproc/state_proof.rs

@@ -145,32 +145,32 @@ impl TryFrom<HexScalar> for WrapScalar {
     }
 }
 
-pub fn parse(proof_json: &serde_json::Value) -> Result<StateProof, String> {
-    serde_json::from_value(proof_json.to_owned())
-        .map_err(|err| format!("Could not parse proof: {err}"))
+pub fn parse(mina_state_proof_vk_query_str: &str) -> Result<StateProof, String> {
+    let mina_state_proof_vk_query: serde_json::Map<String, serde_json::Value> =
+        serde_json::from_str(mina_state_proof_vk_query_str)
+            .map_err(|err| format!("Could not parse mina state proof vk query: {err}"))?;
+    let protocol_state_proof_json = mina_state_proof_vk_query
+            .get("data")
+            .and_then(|d| d.get("bestChain"))
+            .and_then(|d| d.get(0))
+            .and_then(|d| d.get("protocolStateProof"))
+            .and_then(|d| d.get("json"))
+            .ok_or("Could not parse protocol state proof: JSON structure upto protocolStateProof is unexpected")?;
+
+    serde_json::from_value(protocol_state_proof_json.to_owned())
+        .map_err(|err| format!("Could not parse mina state proof: {err}"))
 }
 
 #[cfg(test)]
 mod tests {
-    use super::StateProof;
+    use super::parse;
 
     const MINA_STATE_PROOF_VK_QUERY: &str = include_str!(
         "../../../../../batcher/aligned/test_files/mina/mina_state_proof_vk_query.json"
     );
 
     #[test]
     fn parse_protocol_state_proof() {
-        let mina_state_proof_vk_query: serde_json::Map<String, serde_json::Value> =
-            serde_json::from_str(MINA_STATE_PROOF_VK_QUERY).expect("Could not parse JSON query");
-        let protocol_state_proof_json = mina_state_proof_vk_query
-            .get("data")
-            .and_then(|d| d.get("bestChain"))
-            .and_then(|d| d.get(0))
-            .and_then(|d| d.get("protocolStateProof"))
-            .and_then(|d| d.get("json"))
-            .expect("Could not parse protocol state proof: JSON structure upto protocolStateProof is unexpected");
-
-        let _state_proof: StateProof =
-            serde_json::from_value(protocol_state_proof_json.to_owned()).unwrap();
+        parse(MINA_STATE_PROOF_VK_QUERY).unwrap();
     }
 }