fix: use Subnetwork type instead of parsing protocol string

ethereum · Feb 24, 2025 · d6ab117 · d6ab117
1 parent d4743c6
commit d6ab117
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/crates/ethportal-api/src/discv5.rs b/crates/ethportal-api/src/discv5.rs
@@ -5,6 +5,7 @@ use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 use crate::types::{
     discv5::{NodeInfo, Pong, RoutingTableInfo},
     enr::Enr,
+    network::Subnetwork,
 };
 
 /// Discv5 JSON-RPC endpoints
@@ -44,7 +45,7 @@ pub trait Discv5Api {
 
     /// Send a TALKREQ request with a payload to a given peer and wait for response.
     #[method(name = "talkReq")]
-    async fn talk_req(&self, enr: Enr, protocol: String, request: Vec<u8>) -> RpcResult<Bytes>;
+    async fn talk_req(&self, enr: Enr, protocol: Subnetwork, request: Vec<u8>) -> RpcResult<Bytes>;
 
     /// Send a PING message to the designated node and wait for a PONG response.
     #[method(name = "ping")]

diff --git a/crates/ethportal-api/src/types/network.rs b/crates/ethportal-api/src/types/network.rs
@@ -1,5 +1,7 @@
 use std::fmt;
 
+use serde::{Deserialize, Serialize};
+
 /// Enum for different "core" networks.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Network {
@@ -29,7 +31,7 @@ impl std::str::FromStr for Network {
 }
 
 /// Enum for various different portal subnetworks in a "core" network.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub enum Subnetwork {
     Beacon,
     History,

diff --git a/crates/rpc/src/discv5_rpc.rs b/crates/rpc/src/discv5_rpc.rs
@@ -98,12 +98,9 @@ impl Discv5ApiServer for Discv5Api {
     }
 
     /// Send a TALKREQ request with a payload to a given peer and wait for response.
-    async fn talk_req(&self, enr: Enr, protocol: String, request: Vec<u8>) -> RpcResult<Bytes> {
-        let subnetwork = protocol
-            .parse::<Subnetwork>()
-            .map_err(|err| RpcServeError::Message(format!("Unable to parse Subnetwork: {err}")))?;
+    async fn talk_req(&self, enr: Enr, protocol: Subnetwork, request: Vec<u8>) -> RpcResult<Bytes> {
         self.discv5
-            .send_talk_req(enr, subnetwork, request)
+            .send_talk_req(enr, protocol, request)
             .await
             .map_err(|err| RpcServeError::Message(err.to_string()).into())
     }

diff --git a/testing/ethportal-peertest/src/scenarios/basic.rs b/testing/ethportal-peertest/src/scenarios/basic.rs
@@ -107,7 +107,7 @@ pub async fn test_discv5_update_node_info(target: &Client) {
 
 pub async fn test_discv5_talk_req(target: &Client, peertest: &Peertest) {
     let enr = peertest.bootnode.enr.clone();
-    let protocol = String::from("beacon");
+    let protocol = Subnetwork::Beacon;
     let data_radius = U256::MAX.as_ssz_bytes();
     let request = Message::Ping(Ping {
         enr_seq: 1,