Merge branch 'alin/MR-439-use-state-sync-v3' into 'master'

feat: [MR-439] Use `StateSyncVersion::V3`

Default to file index independent (i.e. content only) file hashes in state
manifests. 

See merge request dfinity-lab/public/ic!12561

Author: alin-at-dfinity

rs/state_manager/src/manifest/tests/computation.rs

@@ -1164,24 +1164,24 @@ fn test_file_index_independent_file_hash() {
 
     let (file1_hash_v2_before, file3_hash_v2_before) =
         compute_file1_and_file3_hashes(StateSyncVersion::V2);
-    let (file1_hash_v3_before, file3_hash_v3_before) =
-        compute_file1_and_file3_hashes(StateSyncVersion::V3);
+    let (file1_hash_before, file3_hash_before) =
+        compute_file1_and_file3_hashes(CURRENT_STATE_SYNC_VERSION);
 
     // Directory now contains `file1`, `file2` and `file3`.
     fs::write(root.join(&file2), vec![2u8; 1000])
         .unwrap_or_else(|_| panic!("failed to create file '{}'", file2.display()));
 
     let (file1_hash_v2_after, file3_hash_v2_after) =
         compute_file1_and_file3_hashes(StateSyncVersion::V2);
-    let (file1_hash_v3_after, file3_hash_v3_after) =
-        compute_file1_and_file3_hashes(StateSyncVersion::V3);
+    let (file1_hash_after, file3_hash_after) =
+        compute_file1_and_file3_hashes(CURRENT_STATE_SYNC_VERSION);
 
     // The `file1` `V2` hashes should be equal (same contents, same file index).
     assert_eq!(file1_hash_v2_before, file1_hash_v2_after);
     // But the `file3` `V2` hashes should be different (different file index).
     assert_ne!(file3_hash_v2_before, file3_hash_v2_after);
 
     // And the `V3` hashes should be the same, regardless of file index.
-    assert_eq!(file1_hash_v3_before, file1_hash_v3_after);
-    assert_eq!(file3_hash_v3_before, file3_hash_v3_after);
+    assert_eq!(file1_hash_before, file1_hash_after);
+    assert_eq!(file3_hash_before, file3_hash_after);
 }

rs/state_manager/src/split/tests.rs

@@ -27,7 +27,7 @@ use ic_types::{
     ingress::{IngressState, IngressStatus},
     malicious_flags::MaliciousFlags,
     messages::MessageId,
-    state_sync::{FileInfo, Manifest, StateSyncVersion},
+    state_sync::{FileInfo, Manifest, CURRENT_STATE_SYNC_VERSION},
     Cycles, Height,
 };
 use std::{path::Path, sync::Arc};
@@ -125,7 +125,7 @@ fn read_write_roundtrip() {
         // Compute the manifest of the original checkpoint.
         let metrics = StateManagerMetrics::new(&metrics_registry);
         let manifest_metrics = &metrics.manifest_metrics;
-        let (manifest_before, height_before) = compute_manifest_v3(&layout, manifest_metrics, &log);
+        let (manifest_before, height_before) = compute_manifest(&layout, manifest_metrics, &log);
 
         // Read the latest checkpoint into a state.
         let fd_factory = Arc::new(TestPageAllocatorFileDescriptorImpl::new());
@@ -150,7 +150,7 @@ fn read_write_roundtrip() {
         assert_eq!(2, layout.checkpoint_heights().unwrap().len());
 
         // Compute the manifest of the newly written checkpoint.
-        let (manifest_after, height_after) = compute_manifest_v3(&layout, manifest_metrics, &log);
+        let (manifest_after, height_after) = compute_manifest(&layout, manifest_metrics, &log);
 
         // The two checkpoints' manifests should be identical.
         assert_eq!(manifest_before, manifest_after);
@@ -168,7 +168,7 @@ fn split_subnet_a_prime() {
         let tmp = new_state_layout(log.clone());
         let root = tmp.path().to_path_buf();
 
-        let (manifest_a, height_a) = compute_manifest_v3_for_root(&root, &log);
+        let (manifest_a, height_a) = compute_manifest_for_root(&root, &log);
         assert_eq!(SUBNET_A_FILES, manifest_files(&manifest_a).as_slice());
 
         split(
@@ -180,7 +180,7 @@ fn split_subnet_a_prime() {
         )
         .unwrap();
 
-        let (manifest_a_prime, height_a_prime) = compute_manifest_v3_for_root(&root, &log);
+        let (manifest_a_prime, height_a_prime) = compute_manifest_for_root(&root, &log);
         assert_eq!(
             SUBNET_A_PRIME_FILES,
             manifest_files(&manifest_a_prime).as_slice()
@@ -213,7 +213,7 @@ fn split_subnet_b() {
         let tmp = new_state_layout(log.clone());
         let root = tmp.path().to_path_buf();
 
-        let (manifest_a, height_a) = compute_manifest_v3_for_root(&root, &log);
+        let (manifest_a, height_a) = compute_manifest_for_root(&root, &log);
         assert_eq!(SUBNET_A_FILES, manifest_files(&manifest_a).as_slice());
 
         split(
@@ -225,7 +225,7 @@ fn split_subnet_b() {
         )
         .unwrap();
 
-        let (manifest_b, height_b) = compute_manifest_v3_for_root(&root, &log);
+        let (manifest_b, height_b) = compute_manifest_for_root(&root, &log);
         assert_eq!(SUBNET_B_FILES, manifest_files(&manifest_b).as_slice());
 
         // Checkpoint heights should differ by 1.
@@ -353,8 +353,8 @@ fn new_state_layout(log: ReplicaLogger) -> TempDir {
     tmp
 }
 
-/// Computes the `V3` manifest of the last checkpoint under `state_layout`.
-fn compute_manifest_v3(
+/// Computes the manifest of the last checkpoint under `state_layout`.
+fn compute_manifest(
     state_layout: &StateLayout,
     manifest_metrics: &ManifestMetrics,
     log: &ReplicaLogger,
@@ -365,7 +365,7 @@ fn compute_manifest_v3(
         &mut thread_pool(),
         manifest_metrics,
         log,
-        StateSyncVersion::V3,
+        CURRENT_STATE_SYNC_VERSION,
         &last_checkpoint_layout,
         1024,
         None,
@@ -405,16 +405,16 @@ fn file_info<'a>(file: &str, manifest: &'a Manifest) -> &'a FileInfo {
     panic!("file '{}' not found in manifest: {:?}", file, manifest)
 }
 
-/// Computes the V3 manifest of the latest checkpoint under the state layout at
+/// Computes the manifest of the latest checkpoint under the state layout at
 /// `root`.
-fn compute_manifest_v3_for_root(root: &Path, log: &ReplicaLogger) -> (Manifest, Height) {
+fn compute_manifest_for_root(root: &Path, log: &ReplicaLogger) -> (Manifest, Height) {
     let metrics_registry = MetricsRegistry::new();
     let layout = StateLayout::try_new(log.clone(), root.to_path_buf(), &metrics_registry).unwrap();
 
     // Compute the manifest of the original checkpoint.
     let metrics = StateManagerMetrics::new(&metrics_registry);
     let manifest_metrics = &metrics.manifest_metrics;
-    compute_manifest_v3(&layout, manifest_metrics, log)
+    compute_manifest(&layout, manifest_metrics, log)
 }
 
 fn deserialize_split_from(root: &Path, height: Height) -> SubnetId {

rs/types/types/src/state_sync.rs

@@ -164,7 +164,7 @@ impl Display for StateSyncVersion {
 }
 
 /// The version of StateSync protocol that should be used for all newly created manifests.
-pub const CURRENT_STATE_SYNC_VERSION: StateSyncVersion = StateSyncVersion::V2;
+pub const CURRENT_STATE_SYNC_VERSION: StateSyncVersion = StateSyncVersion::V3;
 
 /// Maximum supported StateSync version.
 ///