Merge branch 'rumenov/drop-statesyncattribute-params' into 'master'

chore: remove the state sync attribute type See merge request dfinity-lab/public/ic!11360
dfinity · Mar 21, 2023 · 8124bd1 · 8124bd1
2 parents 8b60ab1 + f139e7f
commit 8124bd1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/rs/state_manager/src/state_sync.rs b/rs/state_manager/src/state_sync.rs
@@ -15,7 +15,7 @@ use ic_logger::{info, warn, ReplicaLogger};
 use ic_types::{
     artifact::{
         Advert, AdvertSendRequest, ArtifactDestination, ArtifactKind, ArtifactTag, Priority,
-        StateSyncArtifactId, StateSyncAttribute, StateSyncFilter, StateSyncMessage,
+        StateSyncArtifactId, StateSyncFilter, StateSyncMessage,
     },
     chunkable::Chunkable,
     crypto::crypto_hash,
@@ -71,7 +71,7 @@ impl ArtifactKind for StateSyncArtifact {
     const TAG: ArtifactTag = ArtifactTag::StateSyncArtifact;
     type Id = StateSyncArtifactId;
     type Message = StateSyncMessage;
-    type Attribute = StateSyncAttribute;
+    type Attribute = ();
     type Filter = StateSyncFilter;
 
     fn message_to_advert(msg: &StateSyncMessage) -> Advert<StateSyncArtifact> {
@@ -86,7 +86,7 @@ impl ArtifactKind for StateSyncArtifact {
                 height: msg.height,
                 hash: msg.root_hash.clone(),
             },
-            attribute: StateSyncAttribute,
+            attribute: (),
             size: size as usize,
             integrity_hash: crypto_hash(msg).get(),
         }
@@ -200,8 +200,7 @@ impl ArtifactClient<StateSyncArtifact> for StateSync {
 
     fn get_priority_function(
         &self,
-    ) -> Box<dyn Fn(&StateSyncArtifactId, &StateSyncAttribute) -> Priority + Send + Sync + 'static>
-    {
+    ) -> Box<dyn Fn(&StateSyncArtifactId, &()) -> Priority + Send + Sync + 'static> {
         use ic_interfaces_state_manager::StateReader;
 
         let latest_height = self.state_manager.latest_state_height();

diff --git a/rs/state_manager/tests/state_manager.rs b/rs/state_manager/tests/state_manager.rs
@@ -27,7 +27,7 @@ use ic_test_utilities_logger::with_test_replica_logger;
 use ic_test_utilities_metrics::{fetch_int_counter_vec, fetch_int_gauge, Labels};
 use ic_test_utilities_tmpdir::tmpdir;
 use ic_types::{
-    artifact::{Priority, StateSyncArtifactId, StateSyncAttribute},
+    artifact::{Priority, StateSyncArtifactId},
     chunkable::ChunkId,
     crypto::CryptoHash,
     ingress::{IngressState, IngressStatus, WasmResult},
@@ -1726,7 +1726,7 @@ fn state_sync_priority_fn_respects_states_to_fetch() {
                         height: height(*h),
                         hash: hash(*h as u8),
                     },
-                    &StateSyncAttribute
+                    &()
                 )
             );
         }
@@ -1742,7 +1742,7 @@ fn state_sync_priority_fn_respects_states_to_fetch() {
                     height: height(3),
                     hash: hash(3),
                 },
-                &StateSyncAttribute
+                &()
             )
         );
         // Wrong hash
@@ -1753,7 +1753,7 @@ fn state_sync_priority_fn_respects_states_to_fetch() {
                     height: height(3),
                     hash: hash(4),
                 },
-                &StateSyncAttribute
+                &()
             )
         );
 
@@ -1767,7 +1767,7 @@ fn state_sync_priority_fn_respects_states_to_fetch() {
                     height: height(3),
                     hash: hash(3),
                 },
-                &StateSyncAttribute
+                &()
             )
         );
         assert_eq!(
@@ -1777,7 +1777,7 @@ fn state_sync_priority_fn_respects_states_to_fetch() {
                     height: height(4),
                     hash: hash(4),
                 },
-                &StateSyncAttribute
+                &()
             )
         );
     });

diff --git a/rs/types/types/src/artifact.rs b/rs/types/types/src/artifact.rs
@@ -70,7 +70,7 @@ pub enum ArtifactAttribute {
     EcdsaMessage(EcdsaMessageAttribute),
     CanisterHttpMessage(CanisterHttpResponseAttribute),
     FileTreeSync(FileTreeSyncAttribute),
-    StateSync(StateSyncAttribute),
+    StateSync(()),
 }
 
 /// Artifact identifier type.
@@ -555,10 +555,6 @@ impl std::hash::Hash for StateSyncMessage {
     }
 }
 
-/// State sync atrribute.
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct StateSyncAttribute;
-
 /// State sync filter is by height.
 #[derive(Default, Clone, Debug, PartialEq, Eq, Hash)]
 pub struct StateSyncFilter {