fix(verkle): remove duplicate Verkle definitions

morph-dev · Jun 19, 2024 · 786c7e2 · 786c7e2
1 parent 37f11e8
commit 786c7e2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/ethportal-api/src/types/portal_wire.rs b/ethportal-api/src/types/portal_wire.rs
@@ -173,7 +173,6 @@ pub enum ProtocolId {
     History,
     TransactionGossip,
     CanonicalIndices,
-    Verkle,
     Beacon,
     Utp,
 }
@@ -247,7 +246,6 @@ impl fmt::Display for ProtocolId {
             ProtocolId::History => "History",
             ProtocolId::TransactionGossip => "Transaction Gossip",
             ProtocolId::CanonicalIndices => "Canonical Indices",
-            ProtocolId::Verkle => "Verkle",
             ProtocolId::Beacon => "Beacon",
             ProtocolId::Utp => "uTP",
         };
@@ -263,7 +261,6 @@ impl From<ProtocolId> for u8 {
             ProtocolId::History => 0,
             ProtocolId::TransactionGossip => 3,
             ProtocolId::CanonicalIndices => 4,
-            ProtocolId::Verkle => 5,
             ProtocolId::Beacon => 1,
             ProtocolId::Utp => 99,
         }

diff --git a/portalnet/src/events.rs b/portalnet/src/events.rs
@@ -150,7 +150,7 @@ impl PortalnetEvents {
                     request.into(),
                     "state",
                 ),
-                ProtocolId::Verkle => self.send_overlay_request(
+                ProtocolId::VerkleState => self.send_overlay_request(
                     self.verkle_handle.tx.as_ref(),
                     request.into(),
                     "verkle",
@@ -185,7 +185,7 @@ impl PortalnetEvents {
             ProtocolId::History,
             ProtocolId::Beacon,
             ProtocolId::State,
-            ProtocolId::Verkle,
+            ProtocolId::VerkleState,
         ];
         let mut recipients = event
             .destination
@@ -209,7 +209,7 @@ impl PortalnetEvents {
         if recipients.contains(&ProtocolId::State) {
             self.send_overlay_request(self.state_handle.tx.as_ref(), Event(event.clone()), "state");
         }
-        if recipients.contains(&ProtocolId::Verkle) {
+        if recipients.contains(&ProtocolId::VerkleState) {
             self.send_overlay_request(
                 self.verkle_handle.tx.as_ref(),
                 Event(event.clone()),

diff --git a/rpc/src/builder.rs b/rpc/src/builder.rs
@@ -39,8 +39,8 @@ pub enum PortalRpcModule {
     History,
     /// `state` module
     State,
-    /// 'verkle' module
-    Verkle,
+    /// 'verkle_state' module
+    VerkleState,
     /// `web3_` module
     Web3,
 }
@@ -456,7 +456,7 @@ impl RpcModuleBuilder {
                                 .expect("State protocol not initialized");
                             StateNetworkApi::new(state_tx).into_rpc().into()
                         }
-                        PortalRpcModule::Verkle => {
+                        PortalRpcModule::VerkleState => {
                             let verkle_tx = self
                                 .verkle_tx
                                 .clone()

diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
@@ -66,7 +66,7 @@ pub async fn launch_jsonrpc_server(
                 modules.push(PortalRpcModule::Eth);
             }
             STATE_NETWORK => modules.push(PortalRpcModule::State),
-            VERKLE_NETWORK => modules.push(PortalRpcModule::Verkle),
+            VERKLE_NETWORK => modules.push(PortalRpcModule::VerkleState),
             BEACON_NETWORK => modules.push(PortalRpcModule::Beacon),
             _ => panic!("Unexpected network type: {network}"),
         }

diff --git a/trin-metrics/src/labels.rs b/trin-metrics/src/labels.rs
@@ -10,7 +10,6 @@ impl From<ProtocolLabel> for MetricLabel {
             ProtocolLabel::History => "history",
             ProtocolLabel::TransactionGossip => "transaction_gossip",
             ProtocolLabel::CanonicalIndices => "canonical_indices",
-            ProtocolLabel::Verkle => "verkle",
             ProtocolLabel::Beacon => "beacon",
             ProtocolLabel::Utp => "utp",
         }
@@ -94,7 +93,6 @@ pub enum ProtocolLabel {
     History,
     TransactionGossip,
     CanonicalIndices,
-    Verkle,
     Beacon,
     Utp,
 }
@@ -128,7 +126,6 @@ impl From<&ProtocolId> for ProtocolLabel {
             ProtocolId::History => Self::History,
             ProtocolId::TransactionGossip => Self::TransactionGossip,
             ProtocolId::CanonicalIndices => Self::CanonicalIndices,
-            ProtocolId::Verkle => Self::Verkle,
             ProtocolId::Beacon => Self::Beacon,
             ProtocolId::Utp => Self::Utp,
         }

diff --git a/trin-storage/src/versioned/mod.rs b/trin-storage/src/versioned/mod.rs
@@ -21,7 +21,7 @@ pub use utils::create_store;
 pub enum ContentType {
     History,
     State,
-    Verkle,
+    VerkleState,
 }
 
 /// The version of the store. There should be exactly one implementation of the

diff --git a/trin-verkle/src/network.rs b/trin-verkle/src/network.rs
@@ -52,7 +52,7 @@ impl VerkleNetwork {
             discovery,
             utp_socket,
             storage,
-            ProtocolId::Verkle,
+            ProtocolId::VerkleState,
             validator,
         )
         .await;

diff --git a/trin-verkle/src/storage.rs b/trin-verkle/src/storage.rs
@@ -50,9 +50,10 @@ impl ContentStore for VerkleStorage {
 impl VerkleStorage {
     pub fn new(config: PortalStorageConfig) -> Result<Self, ContentStoreError> {
         let sql_connection_pool = config.sql_connection_pool.clone();
-        let config = IdIndexedV1StoreConfig::new(ContentType::Verkle, ProtocolId::Verkle, config);
+        let config =
+            IdIndexedV1StoreConfig::new(ContentType::VerkleState, ProtocolId::VerkleState, config);
         Ok(Self {
-            store: create_store(ContentType::Verkle, config, sql_connection_pool)?,
+            store: create_store(ContentType::VerkleState, config, sql_connection_pool)?,
         })
     }