fix: improve api

Author: morph-dev

bin/portal-bridge/src/census/mod.rs

@@ -69,10 +69,10 @@ impl Census {
     }
 
     /// Selects peers to receive content.
-    pub fn select_peers<TContentKey: OverlayContentKey>(
+    pub fn select_peers(
         &self,
         subnetwork: Subnetwork,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
     ) -> Result<Vec<PeerInfo>, CensusError> {
         match subnetwork {
             Subnetwork::History => self.history.select_peers(content_key),

bin/portal-bridge/src/census/network.rs

@@ -106,9 +106,9 @@ impl Network {
     }
 
     /// Selects peers to receive content.
-    pub fn select_peers<TContentKey: OverlayContentKey>(
+    pub fn select_peers(
         &self,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
     ) -> Result<Vec<PeerInfo>, CensusError> {
         if self.peers.is_empty() {
             error!(

bin/portal-bridge/src/census/peer.rs

@@ -75,9 +75,9 @@ impl Peer {
     }
 
     /// Returns true if content is within radius.
-    pub fn is_interested_in_content<TContentKey: OverlayContentKey>(
+    pub fn is_interested_in_content(
         &self,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
         content_id: &[u8; 32],
     ) -> bool {
         if content_key.affected_by_radius() {

bin/portal-bridge/src/census/peers.rs

@@ -123,9 +123,9 @@ impl<W: Weight> Peers<W> {
     }
 
     /// Selects peers to receive content.
-    pub fn select_peers<TContentKey: OverlayContentKey>(
+    pub fn select_peers(
         &self,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
     ) -> Vec<PeerInfo> {
         self.selector
             .select_peers(content_key, self.read().peers.values())

bin/portal-bridge/src/census/scoring.rs

@@ -11,16 +11,16 @@ use super::peer::{Peer, PeerInfo};
 
 /// A trait for calculating peer's weight.
 pub trait Weight: Send + Sync {
-    fn weight<TContentKey: OverlayContentKey>(
+    fn weight(
         &self,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
         content_id: &[u8; 32],
         peer: &Peer,
     ) -> u32;
 
-    fn weight_all<'a, TContentKey: OverlayContentKey>(
+    fn weight_all<'a>(
         &self,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
         peers: impl IntoIterator<Item = &'a Peer>,
     ) -> impl Iterator<Item = (&'a Peer, u32)> {
         let content_id = content_key.content_id();
@@ -81,9 +81,9 @@ impl Default for AdditiveWeight {
 }
 
 impl Weight for AdditiveWeight {
-    fn weight<TContentKey: OverlayContentKey>(
+    fn weight(
         &self,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
         content_id: &[u8; 32],
         peer: &Peer,
     ) -> u32 {
@@ -143,9 +143,9 @@ impl<W: Weight> PeerSelector<W> {
     }
 
     /// Selects up to `self.limit` peers based on their weights.
-    pub fn select_peers<'a, TContentKey: OverlayContentKey>(
+    pub fn select_peers<'a>(
         &self,
-        content_key: &TContentKey,
+        content_key: &impl OverlayContentKey,
         peers: impl IntoIterator<Item = &'a Peer>,
     ) -> Vec<PeerInfo> {
         let weighted_peers = self