chore: rremove unnecessary checks when sending identification broadcast

autonomys · Jan 17, 2025 · d368b04 · d368b04
1 parent 5f3680b
commit d368b04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 27 deletions.
diff --git a/crates/subspace-farmer/src/cluster/cache.rs b/crates/subspace-farmer/src/cluster/cache.rs
@@ -328,7 +328,6 @@ where
             result = identify_responder(
                 &nats_client,
                 cache_id,
-                &caches_details,
                 cache_group,
                 identification_broadcast_interval
             ).fuse() => {
@@ -383,16 +382,12 @@ where
 ///
 /// Implementation is using concurrency with multiple tokio tasks, but can be started multiple times
 /// per controller instance in order to parallelize more work across threads if needed.
-async fn identify_responder<C>(
+async fn identify_responder(
     nats_client: &NatsClient,
     cache_id: CacheId,
-    caches_details: &[CacheDetails<'_, C>],
     cache_group: &str,
     identification_broadcast_interval: Duration,
-) -> anyhow::Result<()>
-where
-    C: PieceCache,
-{
+) -> anyhow::Result<()> {
     let mut subscription = nats_client
         .subscribe_to_broadcasts::<ClusterControllerCacheIdentifyBroadcast>(Some(cache_group), None)
         .await
@@ -423,34 +418,22 @@ where
                 }
 
                 last_identification = Instant::now();
-                send_identify_broadcast(nats_client, cache_id, caches_details, cache_group).await;
+                send_identify_broadcast(nats_client, cache_id, cache_group).await;
                 interval.reset();
             }
             _ = interval.tick().fuse() => {
                 last_identification = Instant::now();
                 trace!("Cache self-identification");
 
-                send_identify_broadcast(nats_client, cache_id, caches_details, cache_group).await;
+                send_identify_broadcast(nats_client, cache_id, cache_group).await;
             }
         }
     }
 
     Ok(())
 }
 
-async fn send_identify_broadcast<C>(
-    nats_client: &NatsClient,
-    cache_id: CacheId,
-    caches_details: &[CacheDetails<'_, C>],
-    cache_group: &str,
-) where
-    C: PieceCache,
-{
-    if caches_details.is_empty() {
-        warn!("No cache, skip sending cache identify notification");
-        return;
-    }
-
+async fn send_identify_broadcast(nats_client: &NatsClient, cache_id: CacheId, cache_group: &str) {
     if let Err(error) = nats_client
         .broadcast(&ClusterCacheIdentifyBroadcast { cache_id }, cache_group)
         .await

diff --git a/crates/subspace-farmer/src/cluster/farmer.rs b/crates/subspace-farmer/src/cluster/farmer.rs
@@ -620,11 +620,6 @@ async fn send_identify_broadcast(
     farmer_id_string: &str,
     farms_details: &[FarmDetails],
 ) {
-    if farms_details.is_empty() {
-        warn!("No farm, skip sending farmer identify notification");
-        return;
-    }
-
     if let Err(error) = nats_client
         .broadcast(
             &new_identify_message(farmer_id, farms_details),