resolves merge conflicts

anza-xyz · Feb 14, 2025 · d0c4563 · d0c4563
1 parent 16f0293
commit d0c4563
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 765 deletions.
diff --git a/gossip/src/crds.rs b/gossip/src/crds.rs
@@ -479,7 +479,7 @@ impl Crds {
         self.shards
             .find(mask, mask_bits)
             .map(move |i| self.table.index(i))
-            .filter(|VersionedCrdsValue { value, .. }| !value.data().is_deprecated())
+            .filter(|VersionedCrdsValue { value, .. }| !value.data.is_deprecated())
     }
 
     /// Update the timestamp's of all the labels that are associated with Pubkey