Fixed mina and mina_account tests and moved test files

Author: xqft

batcher/aligned/test_files/mina/protocol_state.proof

@@ -26,7 +26,7 @@ bs58 = "0.5.1"
 lazy_static = "1.5.0"
 blake2 = "0.10.6"
 once_cell = "1.19.0"
-mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge", branch = "relative_finalization" }
+mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge", branch = "new_account_proof" }
 bincode = "1.3.3"
 
 [patch.crates-io]

batcher/aligned/test_files/mina/protocol_state.pub

@@ -13,7 +13,7 @@ const GRACE_PERIOD_END: u32 = 1440;
 const SUB_WINDOWS_PER_WINDOW: u32 = 11;
 const SLOTS_PER_SUB_WINDOW: u32 = 7;
 
-#[derive(PartialEq)]
+#[derive(Debug, PartialEq)]
 pub enum ChainResult {
     Bridge,
     Candidate,
@@ -138,3 +138,37 @@ fn hash_last_vrf(chain: &MinaProtocolState) -> String {
 fn hash_state(chain: &MinaProtocolState) -> String {
     MinaHash::hash(chain).to_hex()
 }
+
+#[cfg(test)]
+mod test {
+    use mina_bridge_core::proof::state_proof::MinaStateProof;
+
+    use super::*;
+
+    const PROOF_BYTES: &[u8] =
+        include_bytes!("../../../../scripts/test_files/mina/mina_state.proof");
+
+    #[test]
+    fn new_mina_state_passes_consensus_checks() {
+        let valid_proof: MinaStateProof = bincode::deserialize(PROOF_BYTES).unwrap();
+        let old_tip = valid_proof.bridge_tip_state;
+        let new_tip = valid_proof.candidate_chain_states.last().unwrap();
+
+        assert_eq!(
+            select_secure_chain(new_tip, &old_tip).unwrap(),
+            ChainResult::Candidate
+        );
+    }
+
+    #[test]
+    fn old_mina_state_fails_consensus_checks() {
+        let valid_proof: MinaStateProof = bincode::deserialize(PROOF_BYTES).unwrap();
+        let old_tip = valid_proof.bridge_tip_state;
+        let new_tip = valid_proof.candidate_chain_states.last().unwrap();
+
+        assert_eq!(
+            select_secure_chain(&old_tip, new_tip).unwrap(),
+            ChainResult::Bridge
+        );
+    }
+}

batcher/aligned/test_files/mina/protocol_state_bad_consensus.pub

@@ -195,17 +195,14 @@ mod test {
     use super::*;
 
     const PROOF_BYTES: &[u8] =
-        include_bytes!("../../../../batcher/aligned/test_files/mina/protocol_state.proof");
+        include_bytes!("../../../../scripts/test_files/mina/mina_state.proof");
     const PUB_INPUT_BYTES: &[u8] =
-        include_bytes!("../../../../batcher/aligned/test_files/mina/protocol_state.pub");
-    const PROTOCOL_STATE_BAD_HASH_PUB_BYTES: &[u8] =
-        include_bytes!("../../../../batcher/aligned/test_files/mina/protocol_state_bad_hash.pub");
-    const PROTOCOL_STATE_BAD_CONSENSUS_PUB_BYTES: &[u8] = include_bytes!(
-        "../../../../batcher/aligned/test_files/mina/protocol_state_bad_consensus.pub"
-    );
+        include_bytes!("../../../../scripts/test_files/mina/mina_state.pub");
+    const BAD_HASH_PUB_INPUT_BYTES: &[u8] =
+        include_bytes!("../../../../scripts/test_files/mina/mina_state_bad_hash.pub");
 
     #[test]
-    fn protocol_state_proof_verifies() {
+    fn valid_mina_state_proof_verifies() {
         let mut proof_buffer = [0u8; super::MAX_PROOF_SIZE];
         let proof_size = PROOF_BYTES.len();
         assert!(proof_size <= proof_buffer.len());
@@ -222,33 +219,16 @@ mod test {
     }
 
     #[test]
-    fn proof_of_protocol_state_with_bad_hash_does_not_verify() {
+    fn mina_state_proof_with_bad_bridge_tip_hash_does_not_verify() {
         let mut proof_buffer = [0u8; super::MAX_PROOF_SIZE];
         let proof_size = PROOF_BYTES.len();
         assert!(proof_size <= proof_buffer.len());
         proof_buffer[..proof_size].clone_from_slice(PROOF_BYTES);
 
         let mut pub_input_buffer = [0u8; super::MAX_PUB_INPUT_SIZE];
-        let pub_input_size = PROTOCOL_STATE_BAD_HASH_PUB_BYTES.len();
+        let pub_input_size = BAD_HASH_PUB_INPUT_BYTES.len();
         assert!(pub_input_size <= pub_input_buffer.len());
-        pub_input_buffer[..pub_input_size].clone_from_slice(PROTOCOL_STATE_BAD_HASH_PUB_BYTES);
-
-        let result =
-            verify_mina_state_ffi(&proof_buffer, proof_size, &pub_input_buffer, pub_input_size);
-        assert!(!result);
-    }
-
-    #[test]
-    fn proof_of_protocol_state_with_bad_consensus_does_not_verify() {
-        let mut proof_buffer = [0u8; super::MAX_PROOF_SIZE];
-        let proof_size = PROOF_BYTES.len();
-        assert!(proof_size <= proof_buffer.len());
-        proof_buffer[..proof_size].clone_from_slice(PROOF_BYTES);
-
-        let mut pub_input_buffer = [0u8; super::MAX_PUB_INPUT_SIZE];
-        let pub_input_size = PROTOCOL_STATE_BAD_CONSENSUS_PUB_BYTES.len();
-        assert!(pub_input_size <= pub_input_buffer.len());
-        pub_input_buffer[..pub_input_size].clone_from_slice(PROTOCOL_STATE_BAD_CONSENSUS_PUB_BYTES);
+        pub_input_buffer[..pub_input_size].clone_from_slice(BAD_HASH_PUB_INPUT_BYTES);
 
         let result =
             verify_mina_state_ffi(&proof_buffer, proof_size, &pub_input_buffer, pub_input_size);

batcher/aligned/test_files/mina/protocol_state_bad_hash.pub

@@ -10,7 +10,7 @@ import (
 
 func TestMinaStateProofVerifies(t *testing.T) {
 	fmt.Println(os.Getwd())
-	proofFile, err := os.Open("../../batcher/aligned/test_files/mina/protocol_state.proof")
+	proofFile, err := os.Open("../../scripts/test_files/mina/mina_state.proof")
 	if err != nil {
 		t.Errorf("could not open mina state proof file")
 	}
@@ -21,7 +21,7 @@ func TestMinaStateProofVerifies(t *testing.T) {
 		t.Errorf("could not read bytes from mina state proof file")
 	}
 
-	pubInputFile, err := os.Open("../../batcher/aligned/test_files/mina/protocol_state.pub")
+	pubInputFile, err := os.Open("../../scripts/test_files/mina/mina_state.pub")
 	if err != nil {
 		t.Errorf("could not open mina state hash file")
 	}

operator/mina/lib/Cargo.lock

@@ -10,7 +10,7 @@ import (
 
 func TestMinaStateProofVerifies(t *testing.T) {
 	fmt.Println(os.Getwd())
-	proofFile, err := os.Open("../../batcher/aligned/test_files/mina/account_B62qrQKS9ghd91shs73TCmBJRW9GzvTJK443DPx2YbqcyoLc56g1ny9.proof")
+	proofFile, err := os.Open("../../scripts/test_files/mina_account/account_B62qrQKS9ghd91shs73TCmBJRW9GzvTJK443DPx2YbqcyoLc56g1ny9.proof")
 	if err != nil {
 		t.Errorf("could not open mina account proof file")
 	}
@@ -21,7 +21,7 @@ func TestMinaStateProofVerifies(t *testing.T) {
 		t.Errorf("could not read bytes from mina account proof file")
 	}
 
-	pubInputFile, err := os.Open("../../batcher/aligned/test_files/mina/account_B62qrQKS9ghd91shs73TCmBJRW9GzvTJK443DPx2YbqcyoLc56g1ny9.pub")
+	pubInputFile, err := os.Open("../../scripts/test_files/mina_account/account_B62qrQKS9ghd91shs73TCmBJRW9GzvTJK443DPx2YbqcyoLc56g1ny9.pub")
 	if err != nil {
 		t.Errorf("could not open mina account pub inputs file")
 	}