Merge branch 'mraszyk/no-state-hashing-during-catchup' into mraszyk/optimized-node-catch-up

Author: mraszyk

rs/state_manager/src/lib.rs

@@ -3043,8 +3043,7 @@ impl StateManager for StateManagerImpl {
             states.certifications.keys().cloned().collect();
         drop(states);
 
-        let fast_forward_height =
-            self.fast_forward_height.load(Ordering::Relaxed);
+        let fast_forward_height = self.fast_forward_height.load(Ordering::Relaxed);
         let state_heights = tip_height
             ..min(
                 tip_height + MAX_FUTURE_HEIGHTS_TO_CERTIFY,

rs/state_manager/tests/state_manager.rs

@@ -5,8 +5,8 @@ use ic_canonical_state::lazy_tree_conversion::state_height_as_tree;
 use ic_canonical_state_tree_hash::lazy_tree::materialize::materialize;
 use ic_config::state_manager::{Config, lsmt_config_default};
 use ic_crypto_tree_hash::{
-    Label, LabeledTree, LookupStatus, MatchPattern, MixedHashTree, Path as LabelPath, flatmap,
-    recompute_digest, sparse_labeled_tree_from_paths, Witness,
+    Label, LabeledTree, LookupStatus, MatchPattern, MixedHashTree, Path as LabelPath, Witness,
+    flatmap, recompute_digest, sparse_labeled_tree_from_paths,
 };
 use ic_interfaces::certification::Verifier;
 use ic_interfaces::p2p::state_sync::{ChunkId, Chunkable, StateSyncArtifactId, StateSyncClient};