tests: add diff snapshots for proofs in compare folder

Author: zjp-CN

tests/compare.rs

@@ -1,5 +1,4 @@
-use std::fs::{copy, remove_file};
-
+use std::fs::{copy, create_dir_all, remove_file};
 mod utils;
 use utils::{assert_eq, *};
 
@@ -10,22 +9,38 @@ fn get(text: &str, start: &str) -> SerFunction {
 }
 
 const COMPARE: &str = "tests/compare";
+const SNAP_COMPARE: &str = "tests/snapshots/compare";
+const EXPECT_COMPARE: &str = "./snapshots/compare";
 
 fn compare(
-    tmp: &str,
+    shared_file: &str,
     v_file: &[&str],
     f: &str,
     assert: impl Fn(&SerFunction, &SerFunction, &str, &str, &str),
 ) {
+    struct ProofPath {
+        src_file: String,
+        hash_json: String,
+        hash_json_expected: String,
+    }
+
     let len = v_file.len();
     assert!(len > 1);
-    let tmp = format!("{COMPARE}/{tmp}.rs");
+    let v_path: Vec<_> = v_file
+        .iter()
+        .map(|file| ProofPath {
+            src_file: format!("{COMPARE}/{file}.rs"),
+            hash_json: format!("{SNAP_COMPARE}/{file}.json"),
+            hash_json_expected: format!("{EXPECT_COMPARE}/{file}.json"),
+        })
+        .collect();
+    let tmp = format!("{COMPARE}/{shared_file}.rs");
 
     let mut v_func = vec![];
-    for ele in v_file {
-        copy(format!("{COMPARE}/{ele}.rs"), &tmp).unwrap();
+    for path in &v_path {
+        copy(&path.src_file, &tmp).unwrap();
         let text = run_dv(&[&tmp]);
-        expect_file![format!("./snapshots/compare/{ele}.json")].assert_eq(&text);
+        expect_file![&path.hash_json_expected].assert_eq(&text);
         v_func.push(get(&text, f));
     }
 
@@ -38,10 +53,19 @@ fn compare(
             assert(&v_func[i], &v_func[j], f, v_file[i], v_file[j]);
         }
     }
+
+    if let [old, new] = v_path.as_slice() {
+        let diff = run_vrs_diff(&old.hash_json, &new.hash_json);
+        let diff_json = format!("{EXPECT_COMPARE}/diff/{shared_file}.json");
+        expect_file![diff_json].assert_eq(&diff);
+    }
 }
 
 #[test]
 fn test_compare() {
+    _ = create_dir_all(SNAP_COMPARE);
+    _ = create_dir_all(format!("{SNAP_COMPARE}/diff"));
+
     fn eq(fn1: &SerFunction, fn2: &SerFunction, f: &str, f1: &str, f2: &str) {
         assert_eq!(
             fn1.hash, fn2.hash,

tests/snapshots/compare/diff/contract.json

@@ -0,0 +1,77 @@
+[
+  {
+    "hash": "16423392687644375364724657870187103190",
+    "name": "std::ptr::drop_in_place::<{closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "library/core/src/ptr/mod.rs"
+  },
+  {
+    "hash": "16423392687644375364724657870187103190",
+    "name": "std::ptr::drop_in_place::<{closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "library/core/src/ptr/mod.rs"
+  },
+  {
+    "hash": "16423392687644375364724657870187103190",
+    "name": "std::ptr::drop_in_place::<{closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "library/core/src/ptr/mod.rs"
+  },
+  {
+    "hash": "16423392687644375364724657870187103190",
+    "name": "std::ptr::drop_in_place::<{closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "library/core/src/ptr/mod.rs"
+  },
+  {
+    "hash": "124569496921490884488960393718969893620",
+    "name": "verify::g",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "73887258241161092881667616569680888010",
+    "name": "verify::g::kani_contract_mode",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "5310357021794338182513150670169962678",
+    "name": "verify::g::kani_force_fn_once::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "5310357021794338182513150670169962678",
+    "name": "verify::g::kani_force_fn_once::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "5310357021794338182513150670169962678",
+    "name": "verify::g::kani_force_fn_once::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "5310357021794338182513150670169962678",
+    "name": "verify::g::kani_force_fn_once::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "82608928646705306325144146458835407768",
+    "name": "verify::g::kani_register_contract::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "82608928646705306325144146458835407768",
+    "name": "verify::g::kani_register_contract::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "82608928646705306325144146458835407768",
+    "name": "verify::g::kani_register_contract::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "82608928646705306325144146458835407768",
+    "name": "verify::g::kani_register_contract::<(), {closure@tests/compare/contract.rs:11:5: 11:29}>",
+    "file": "tests/compare/contract.rs"
+  },
+  {
+    "hash": "843182267809226023016425080225293048998",
+    "name": "verify::g::{closure#0}::REENTRY",
+    "file": "tests/compare/contract.rs"
+  }
+]

tests/snapshots/compare/diff/gen_proofs_by_nested_macros.json

@@ -0,0 +1,8 @@
+[
+  {
+    "hash": "6049791535301547191723508871959023129",
+    "name": "verify::proof1",
+    "file": "tests/compare/gen_proofs_by_nested_macros.rs",
+    "proof_kind": "Standard"
+  }
+]

tests/snapshots/compare/diff/proof.json

@@ -0,0 +1,8 @@
+[
+  {
+    "hash": "1360231931955151956814099580363286591245",
+    "name": "verify::g",
+    "file": "tests/compare/proof.rs",
+    "proof_kind": "Standard"
+  }
+]

tests/utils.rs

@@ -11,7 +11,9 @@ pub fn run_dv(args: &[&str]) -> String {
     run(env!("CARGO_PKG_NAME"), args)
 }
 
-pub fn run_vrs(args: &[&str]) -> String {
+// verify_rust_std diff --old tests/snapshots/compare/proof1.json --new tests/snapshots/compare/proof2.json --hash-json
+pub fn run_vrs_diff(old: &str, new: &str) -> String {
+    let args = &["diff", "--old", old, "--new", new, "--hash-json"];
     run("verify_rust_std", args)
 }