From 5eeea0882fb33ed3b653b37d68f78dc74864501f Mon Sep 17 00:00:00 2001 From: tersec Date: Fri, 11 Oct 2024 06:57:57 +0000 Subject: [PATCH] rm experimental Yamux support --- beacon_chain/conf.nim | 6 ------ beacon_chain/conf_light_client.nim | 6 ------ beacon_chain/networking/eth2_network.nim | 6 +----- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/beacon_chain/conf.nim b/beacon_chain/conf.nim index e5fe687aea..619f6de755 100644 --- 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 index 2d20cde067..3c174c75e4 100644 --- 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 index 5807057fbc..acd3106feb 100644 --- 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