version sub-directories for data dir

EspressoSystems · Jul 10, 2024 · bfa3d9c · bfa3d9c
1 parent 1127c84
commit bfa3d9c
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 8 deletions.
diff --git a/data/chain_config.bin b/data/chain_config.bin
diff --git a/data/fee_info.bin b/data/fee_info.bin
diff --git a/data/header_v1.bin b/data/header_v1.bin
diff --git a/data/header_v2.bin b/data/header_v2.bin
diff --git a/data/header_v3.bin b/data/header_v3.bin
diff --git a/data/l1_block.bin b/data/l1_block.bin
diff --git a/data/messages.bin b/data/messages.bin
diff --git a/data/ns_table.bin b/data/ns_table.bin
diff --git a/data/payload.bin b/data/payload.bin
diff --git a/data/transaction.bin b/data/transaction.bin
diff --git a/data/tx_index.bin b/data/tx_index.bin
diff --git a/data/chain_config.json → data/v1/chain_config.json b/data/chain_config.json → data/v1/chain_config.json
diff --git a/data/fee_info.json → data/v1/fee_info.json b/data/fee_info.json → data/v1/fee_info.json
diff --git a/data/header_v1.json → data/v1/header.json b/data/header_v1.json → data/v1/header.json
diff --git a/data/l1_block.json → data/v1/l1_block.json b/data/l1_block.json → data/v1/l1_block.json
diff --git a/data/messages.json → data/v1/messages.json b/data/messages.json → data/v1/messages.json
diff --git a/data/ns_table.json → data/v1/ns_table.json b/data/ns_table.json → data/v1/ns_table.json
diff --git a/data/payload.json → data/v1/payload.json b/data/payload.json → data/v1/payload.json
diff --git a/data/transaction.json → data/v1/transaction.json b/data/transaction.json → data/v1/transaction.json
diff --git a/data/tx_index.json → data/v1/tx_index.json b/data/tx_index.json → data/v1/tx_index.json
diff --git a/data/header_v2.json → data/v2/header.json b/data/header_v2.json → data/v2/header.json
diff --git a/data/header_v3.json → data/v3/header.json b/data/header_v3.json → data/v3/header.json
diff --git a/types/src/reference_tests.rs b/types/src/reference_tests.rs
@@ -169,15 +169,21 @@ async fn reference_tx_index() -> <Payload as QueryablePayload<SeqTypes>>::Transa
 }
 
 fn reference_test_without_committable<T: Serialize + DeserializeOwned + Eq + Debug>(
+    version: &str,
     name: &str,
     reference: &T,
 ) {
     setup_logging();
     setup_backtrace();
 
     // Load the expected serialization from the repo.
-    let data_dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("../data");
-    let expected_bytes = std::fs::read(data_dir.join(format!("{name}.json"))).unwrap();
+    let data_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("../data")
+        .join(version);
+
+    let file_path = data_dir.join(format!("{name}.json"));
+
+    let expected_bytes = std::fs::read(file_path).unwrap();
     let expected: Value = serde_json::from_slice(&expected_bytes).unwrap();
 
     // Check that the reference object matches the expected serialized form.
@@ -250,14 +256,15 @@ change in the serialization of this data structure.
 }
 
 fn reference_test<T: Committable + Serialize + DeserializeOwned + Eq + Debug>(
+    version: &str,
     name: &str,
     reference: T,
     commitment: &str,
 ) {
     setup_logging();
     setup_backtrace();
 
-    reference_test_without_committable(name, &reference);
+    reference_test_without_committable(version, name, &reference);
 
     // Print information about the commitment that might be useful in generating tests for other
     // languages.
@@ -286,17 +293,18 @@ Actual: {actual}
 
 #[async_std::test]
 async fn test_reference_payload() {
-    reference_test_without_committable("payload", &reference_payload().await);
+    reference_test_without_committable("v1", "payload", &reference_payload().await);
 }
 
 #[async_std::test]
 async fn test_reference_tx_index() {
-    reference_test_without_committable("tx_index", &reference_tx_index().await);
+    reference_test_without_committable("v1", "tx_index", &reference_tx_index().await);
 }
 
 #[async_std::test]
 async fn test_reference_ns_table() {
     reference_test(
+        "v1",
         "ns_table",
         reference_ns_table().await,
         REFERENCE_NS_TABLE_COMMITMENT,
@@ -306,6 +314,7 @@ async fn test_reference_ns_table() {
 #[test]
 fn test_reference_l1_block() {
     reference_test(
+        "v1",
         "l1_block",
         reference_l1_block(),
         REFERENCE_L1_BLOCK_COMMITMENT,
@@ -315,6 +324,7 @@ fn test_reference_l1_block() {
 #[test]
 fn test_reference_chain_config() {
     reference_test(
+        "v1",
         "chain_config",
         reference_chain_config(),
         REFERENCE_CHAIN_CONFIG_COMMITMENT,
@@ -324,6 +334,7 @@ fn test_reference_chain_config() {
 #[test]
 fn test_reference_fee_info() {
     reference_test(
+        "v1",
         "fee_info",
         reference_fee_info(),
         REFERENCE_FEE_INFO_COMMITMENT,
@@ -333,19 +344,22 @@ fn test_reference_fee_info() {
 #[async_std::test]
 async fn test_reference_header() {
     reference_test(
-        "header_v1",
+        "v1",
+        "header",
         reference_header(StaticVersion::<0, 1>::version()).await,
         REFERENCE_V1_HEADER_COMMITMENT,
     );
 
     reference_test(
-        "header_v2",
+        "v2",
+        "header",
         reference_header(StaticVersion::<0, 2>::version()).await,
         REFERENCE_V2_HEADER_COMMITMENT,
     );
 
     reference_test(
-        "header_v3",
+        "v3",
+        "header",
         reference_header(StaticVersion::<0, 3>::version()).await,
         REFERENCE_V3_HEADER_COMMITMENT,
     );
@@ -354,6 +368,7 @@ async fn test_reference_header() {
 #[test]
 fn test_reference_transaction() {
     reference_test(
+        "v1",
         "transaction",
         reference_transaction(12648430_u32.into(), &mut jf_utils::test_rng()),
         REFERENCE_TRANSACTION_COMMITMENT,