rm experimental Yamux support

status-im · Oct 11, 2024 · 5eeea08 · 5eeea08
1 parent b4efaaa
commit 5eeea08
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/beacon_chain/conf.nim b/beacon_chain/conf.nim
@@ -330,12 +330,6 @@ type
         defaultValue: false
         name: "enr-auto-update" .}: bool
 
-      enableYamux* {.
-        hidden
-        desc: "Enable the Yamux multiplexer"
-        defaultValue: false
-        name: "debug-enable-yamux" .}: bool
-
       weakSubjectivityCheckpoint* {.
         desc: "Weak subjectivity checkpoint in the format block_root:epoch_number"
         name: "weak-subjectivity-checkpoint" .}: Option[Checkpoint]

diff --git a/beacon_chain/conf_light_client.nim b/beacon_chain/conf_light_client.nim
@@ -100,12 +100,6 @@ type LightClientConf* = object
     defaultValue: false
     name: "enr-auto-update" .}: bool
 
-  enableYamux* {.
-    hidden
-    desc: "Enable the Yamux multiplexer"
-    defaultValue: false
-    name: "debug-enable-yamux" .}: bool
-
   agentString* {.
     defaultValue: "nimbus",
     desc: "Node agent string which is used as identifier in network"

diff --git a/beacon_chain/networking/eth2_network.nim b/beacon_chain/networking/eth2_network.nim
@@ -2249,11 +2249,7 @@ proc newBeaconSwitch(config: BeaconNodeConf | LightClientConf,
                      rng: ref HmacDrbgContext): Switch {.raises: [CatchableError].} =
   let service: Service = WildcardAddressResolverService.new()
 
-  var sb =
-    if config.enableYamux:
-      SwitchBuilder.new().withYamux()
-    else:
-      SwitchBuilder.new()
+  var sb = SwitchBuilder.new()
   # Order of multiplexers matters, the first will be default
 
   sb