Switch to generic type parameter for content key when building ACCEPT response.

Author: ogenev

trin-core/src/portalnet/overlay_service.rs

@@ -6,7 +6,7 @@ use crate::{
         metrics::OverlayMetrics,
         storage::PortalStorage,
         types::{
-            content_key::{HistoryContentKey, OverlayContentKey},
+            content_key::OverlayContentKey,
             messages::{
                 Accept, ByteList, Content, CustomPayload, FindContent, FindNodes, Message, Nodes,
                 Offer, Ping, Pong, ProtocolId, Request, Response, SszEnr,
@@ -643,7 +643,7 @@ impl<TContentKey: OverlayContentKey + Send, TMetric: Metric + Send>
         }
     }
 
-    /// Attempts to build a `Accept` response for an `Offer` request.
+    /// Attempts to build an `Accept` response for an `Offer` request.
     fn handle_offer(&self, request: Offer) -> Result<Accept, OverlayRequestError> {
         self.metrics
             .as_ref()
@@ -659,21 +659,25 @@ impl<TContentKey: OverlayContentKey + Send, TMetric: Metric + Send>
         let accept_keys = request.content_keys.clone();
 
         for (i, key) in request.content_keys.into_iter().enumerate() {
-            // TODO: This will not work when we receive state Offer message with state content keys
-            // we need to refactor it in a way to get access to the protocol id in this method
-            let key = HistoryContentKey::try_from(key)
-                .map_err(|err| OverlayRequestError::AcceptError(err.to_string()))?;
+            let key = (TContentKey::try_from)(key).map_err(|_| {
+                OverlayRequestError::AcceptError(format!(
+                    "Unable to build content key from OFFER request."
+                ))
+            })?;
+
             requested_keys
                 .set(
                     i,
-                    self.storage.read().should_store(&key).map_err(|_| {
-                        OverlayRequestError::AcceptError(
-                            "Portal storage error: unable to check content availability".to_owned(),
-                        )
+                    self.storage.read().should_store(&key).map_err(|err| {
+                        OverlayRequestError::AcceptError(format!(
+                            "Unable to check content availability: {err}"
+                        ))
                     })?,
                 )
-                .map_err(|_| {
-                    OverlayRequestError::AcceptError("Unable to set requested keys bits".to_owned())
+                .map_err(|err| {
+                    OverlayRequestError::AcceptError(format!(
+                        "Unable to set requested keys bits: {err:?}"
+                    ))
                 })?;
         }