relayer: remove RelayV2 init code

Author: eval-exec

light-client-bin/src/subcmds.rs

@@ -69,19 +69,11 @@ impl RunConfig {
             BAD_MESSAGE_ALLOWED_EACH_HOUR,
         ));
         let sync_protocol = SyncProtocol::new(storage.clone(), Arc::clone(&peers));
-        let relay_protocol_v2 = RelayProtocol::new(
+        let relay_protocol = RelayProtocol::new(
             pending_txs.clone(),
             Arc::clone(&peers),
             consensus.clone(),
             storage.clone(),
-            false,
-        );
-        let relay_protocol_v3 = RelayProtocol::new(
-            pending_txs.clone(),
-            Arc::clone(&peers),
-            consensus.clone(),
-            storage.clone(),
-            true,
         );
         let light_client: Box<dyn CKBProtocolHandler> = Box::new(LightClientProtocol::new(
             storage.clone(),
@@ -96,14 +88,9 @@ impl RunConfig {
                 Box::new(sync_protocol),
                 Arc::clone(&network_state),
             ),
-            CKBProtocol::new_with_support_protocol(
-                SupportProtocols::RelayV2,
-                Box::new(relay_protocol_v2),
-                Arc::clone(&network_state),
-            ),
             CKBProtocol::new_with_support_protocol(
                 SupportProtocols::RelayV3,
-                Box::new(relay_protocol_v3),
+                Box::new(relay_protocol),
                 Arc::clone(&network_state),
             ),
             CKBProtocol::new_with_support_protocol(

light-client-lib/src/protocols/relayer.rs

@@ -29,7 +29,6 @@ pub struct RelayProtocol {
 
     consensus: Consensus,
     storage: Storage,
-    v3: bool,
 }
 
 // a simple struct to store the pending transactions in memory with size limit
@@ -94,15 +93,13 @@ impl RelayProtocol {
         connected_peers: Arc<Peers>,
         consensus: Consensus,
         storage: Storage,
-        v3: bool,
     ) -> Self {
         Self {
             opened_peers: HashMap::new(),
             pending_txs,
             connected_peers,
             consensus,
             storage,
-            v3,
         }
     }
 }
@@ -144,29 +141,12 @@ impl CKBProtocolHandler for RelayProtocol {
             }
         };
 
-        let ckb2023 = self
-            .consensus
-            .hardfork_switch
-            .ckb2023
-            .is_vm_version_2_and_syscalls_3_enabled(epoch);
-
         debug!(
-            "RelayProtocol V{}({}).connected peer={}, epoch={}",
-            if self.v3 { '3' } else { '2' },
-            version,
+            "RelayProtocol.connected peer={}, version={}, epoch={}",
             peer,
+            version,
             epoch
         );
-
-        if self.v3 && !ckb2023 {
-            debug!("peer={} is not ckb2023 enabled, ignore", peer);
-            return;
-        }
-
-        if !self.v3 && ckb2023 {
-            debug!("peer={} is ckb2023 enabled, ignore", peer);
-            return;
-        }
         #[cfg(target_arch = "wasm32")]
         let flag = self
             .pending_txs

wasm/light-client-wasm/src/lib.rs

@@ -188,19 +188,11 @@ pub async fn light_client(
     ));
 
     let sync_protocol = SyncProtocol::new(storage.clone(), Arc::clone(&peers));
-    let relay_protocol_v2 = RelayProtocol::new(
+    let relay_protocol = RelayProtocol::new(
         pending_txs.clone(),
         Arc::clone(&peers),
         consensus.clone(),
         storage.clone(),
-        false,
-    );
-    let relay_protocol_v3 = RelayProtocol::new(
-        pending_txs.clone(),
-        Arc::clone(&peers),
-        consensus.clone(),
-        storage.clone(),
-        true,
     );
     let light_client: Box<dyn CKBProtocolHandler> = Box::new(LightClientProtocol::new(
         storage.clone(),
@@ -216,14 +208,9 @@ pub async fn light_client(
             Box::new(sync_protocol),
             Arc::clone(&network_state),
         ),
-        CKBProtocol::new_with_support_protocol(
-            SupportProtocols::RelayV2,
-            Box::new(relay_protocol_v2),
-            Arc::clone(&network_state),
-        ),
         CKBProtocol::new_with_support_protocol(
             SupportProtocols::RelayV3,
-            Box::new(relay_protocol_v3),
+            Box::new(relay_protocol),
             Arc::clone(&network_state),
         ),
         CKBProtocol::new_with_support_protocol(