Remove panic in ci

Author: richardpringle

ledger/src/proofs/transaction.rs

@@ -4364,6 +4364,7 @@ mod tests_with_wasm {
 
 #[cfg(test)]
 pub(super) mod tests {
+    use core::panic;
     use std::path::Path;
 
     use ::poseidon::hash::params::MINA_ZKAPP_EVENT;
@@ -4399,13 +4400,6 @@ pub(super) mod tests {
         PerformJob(mina_p2p_messages::v2::SnarkWorkerWorkerRpcsVersionedGetWorkV2TResponse),
     }
 
-    pub fn panic_in_ci() {
-        fn is_ci() -> bool {
-            std::env::var("CI").is_ok()
-        }
-        assert!(!is_ci(), "missing circuit files !");
-    }
-
     fn read_binprot<T, R>(mut r: R) -> T
     where
         T: binprot::BinProtRead,
@@ -4644,19 +4638,13 @@ pub(super) mod tests {
     #[test]
     #[ignore = "Failing due to circuits"]
     fn test_regular_tx() {
-        let Ok(data) =
-            // std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join("request_signed.bin"))
-            // std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join("rampup4").join("request_payment_0_rampup4.bin"))
-            std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join(devnet_circuit_directory()).join("tests").join("command-0-1.bin"))
-            // std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join("rampup4").join("request_payment_1_rampup4.bin"))
-            // std::fs::read("/tmp/fee_transfer_1_rampup4.bin")
-            // std::fs::read("/tmp/coinbase_1_rampup4.bin")
-            // std::fs::read("/tmp/stake_0_rampup4.bin")
-        else {
-            eprintln!("request not found");
-            panic_in_ci();
-            return;
-        };
+        let data = std::fs::read(
+            Path::new(env!("CARGO_MANIFEST_DIR"))
+                .join(devnet_circuit_directory())
+                .join("tests")
+                .join("command-0-1.bin"),
+        )
+        .unwrap();
 
         let (statement, tx_witness, message) = extract_request(&data);
         let TransactionProver {
@@ -4771,19 +4759,13 @@ pub(super) mod tests {
     #[test]
     #[ignore = "Failing due to circuits"]
     fn test_merge_proof() {
-        let Ok(data) =
-            // std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join("request_signed.bin"))
-            // std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join("rampup4").join("merge_0_rampup4.bin"))
-            std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join(devnet_circuit_directory()).join("tests").join("merge-100-0.bin"))
-            // std::fs::read("/tmp/minaa/mina-works-dump/merge-100-0.bin")
-            // std::fs::read("/tmp/fee_transfer_1_rampup4.bin")
-            // std::fs::read("/tmp/coinbase_1_rampup4.bin")
-            // std::fs::read("/tmp/stake_0_rampup4.bin")
-        else {
-            eprintln!("request not found");
-            panic_in_ci();
-            return;
-        };
+        let data = std::fs::read(
+            Path::new(env!("CARGO_MANIFEST_DIR"))
+                .join(devnet_circuit_directory())
+                .join("tests")
+                .join("merge-100-0.bin"),
+        )
+        .unwrap();
 
         let (statement, proofs, message) = extract_merge(&data);
         let TransactionProver {
@@ -4821,16 +4803,13 @@ pub(super) mod tests {
     #[test]
     #[ignore = "Failing due to circuits"]
     fn test_proof_zkapp_sig() {
-        let Ok(data) = std::fs::read(
+        let data = std::fs::read(
             Path::new(env!("CARGO_MANIFEST_DIR"))
                 .join(devnet_circuit_directory())
                 .join("tests")
                 .join("command-1-0.bin"),
-        ) else {
-            eprintln!("request not found");
-            panic_in_ci();
-            return;
-        };
+        )
+        .unwrap();
 
         let (statement, tx_witness, message) = extract_request(&data);
 
@@ -4867,16 +4846,13 @@ pub(super) mod tests {
     #[test]
     #[ignore = "Failing due to circuits"]
     fn test_proof_zkapp_proof() {
-        let Ok(data) = std::fs::read(
+        let data = std::fs::read(
             Path::new(env!("CARGO_MANIFEST_DIR"))
                 .join(devnet_circuit_directory())
                 .join("tests")
                 .join("zkapp-command-with-proof-128-1.bin"),
-        ) else {
-            eprintln!("request not found");
-            panic_in_ci();
-            return;
-        };
+        )
+        .unwrap();
 
         let (statement, tx_witness, message) = extract_request(&data);
 
@@ -4911,16 +4887,13 @@ pub(super) mod tests {
     #[test]
     #[ignore = "Failing due to circuits"]
     fn test_block_proof() {
-        let Ok(data) = std::fs::read(
+        let data = std::fs::read(
             Path::new(env!("CARGO_MANIFEST_DIR"))
                 .join(devnet_circuit_directory())
                 .join("tests")
                 .join("block_input-2483246-0.bin"),
-        ) else {
-            eprintln!("request not found");
-            panic_in_ci();
-            return;
-        };
+        )
+        .unwrap();
 
         let blockchain_input: v2::ProverExtendBlockchainInputStableV2 =
             read_binprot(&mut data.as_slice());
@@ -5038,8 +5011,7 @@ pub(super) mod tests {
 
         if !base_dir.exists() {
             eprintln!("{:?} not found", base_dir);
-            panic_in_ci();
-            return;
+            panic!();
         }
 
         let BlockProver {

ledger/src/proofs/verification.rs

@@ -1033,14 +1033,15 @@ mod tests {
     use mina_curves::pasta::Fp;
     use mina_p2p_messages::{binprot::BinProtRead, v2};
 
-    use crate::proofs::{provers::devnet_circuit_directory, transaction::tests::panic_in_ci};
+    use crate::proofs::provers::devnet_circuit_directory;
 
     use super::*;
 
     #[cfg(target_family = "wasm")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 
     #[test]
+    #[ignore = "the file are missing"]
     fn test_verify_zkapp() {
         use mina_p2p_messages::{
             binprot,
@@ -1066,10 +1067,7 @@ mod tests {
         ];
 
         for filename in cases {
-            let Ok(file) = std::fs::read(base_dir.join(filename)) else {
-                panic_in_ci();
-                return;
-            };
+            let file = std::fs::read(base_dir.join(filename)).expect("file not found");
 
             let VerifyZkapp {
                 vk,