feat(data_structures): allow backwards-compatibility of key data stru…

…ctures
witnet · Nov 20, 2023 · 14e733e · 14e733e
1 parent a5c9917
commit 14e733e
Show file tree

Hide file tree

Showing 7 changed files with 275 additions and 23 deletions.
diff --git a/data_structures/src/chain/mod.rs b/data_structures/src/chain/mod.rs
@@ -4445,6 +4445,7 @@ mod tests {
     };
 
     use crate::{
+        proto::versioning::{ProtocolVersion, VersionedHashable},
         superblock::{mining_build_superblock, ARSIdentities},
         transaction::{CommitTransactionBody, RevealTransactionBody, VTTransactionBody},
     };
@@ -4553,7 +4554,22 @@ mod tests {
     fn test_block_hashable_trait() {
         let block = block_example();
         let expected = "70e15ac70bb00f49c7a593b2423f722dca187bbae53dc2f22647063b17608c01";
-        assert_eq!(block.hash().to_string(), expected);
+        assert_eq!(
+            block.versioned_hash(ProtocolVersion::Legacy).to_string(),
+            expected
+        );
+        let expected = "29ef68357a5c861b9dbe043d351a28472ca450edcda25de4c9b80a4560a28c0f";
+        assert_eq!(
+            block
+                .versioned_hash(ProtocolVersion::Transition)
+                .to_string(),
+            expected
+        );
+        let expected = "29ef68357a5c861b9dbe043d351a28472ca450edcda25de4c9b80a4560a28c0f";
+        assert_eq!(
+            block.versioned_hash(ProtocolVersion::Final).to_string(),
+            expected
+        );
     }
 
     #[test]
@@ -6625,6 +6641,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let expected_indices = vec![0, 2, 2];
@@ -6679,6 +6696,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let expected_indices = vec![0, 2, 2, 8, 10, 6, 4, 6];
@@ -6714,6 +6732,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let result = sb.dr_proof_of_inclusion(&[b1, b2], &dr_txs[2]);
@@ -6724,7 +6743,14 @@ mod tests {
     fn test_dr_merkle_root_no_block() {
         let dr_txs = build_test_dr_txs(3);
 
-        let sb = mining_build_superblock(&[], &[Hash::default()], 1, Hash::default(), 1);
+        let sb = mining_build_superblock(
+            &[],
+            &[Hash::default()],
+            1,
+            Hash::default(),
+            1,
+            ProtocolVersion::Legacy,
+        );
 
         let result = sb.dr_proof_of_inclusion(&[], &dr_txs[2]);
         assert!(result.is_none());
@@ -6750,6 +6776,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let expected_indices = vec![0, 2];
@@ -6788,6 +6815,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let expected_indices = vec![0, 2, 2];
@@ -6850,6 +6878,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let expected_indices = vec![0, 2, 2, 8, 10, 6, 4, 6];
@@ -6885,6 +6914,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let result = sb.tally_proof_of_inclusion(&[b1, b2], &tally_txs[2]);
@@ -6916,6 +6946,7 @@ mod tests {
             1,
             Hash::default(),
             1,
+            ProtocolVersion::Legacy,
         );
 
         let expected_indices = vec![0, 2, 2];

diff --git a/data_structures/src/proto/mod.rs b/data_structures/src/proto/mod.rs
@@ -8,6 +8,7 @@ use std::convert::TryFrom;
 use std::fmt::Debug;
 
 pub mod schema;
+pub mod versioning;
 
 /// Used for establishing correspondence between rust struct
 /// and protobuf rust struct