Skip to content

Commit 4eb23e9

Browse files
committed
rm experimental Yamux support
1 parent 181f5f9 commit 4eb23e9

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

beacon_chain/conf.nim

-6
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,6 @@ type
330330
defaultValue: false
331331
name: "enr-auto-update" .}: bool
332332

333-
enableYamux* {.
334-
hidden
335-
desc: "Enable the Yamux multiplexer"
336-
defaultValue: false
337-
name: "debug-enable-yamux" .}: bool
338-
339333
weakSubjectivityCheckpoint* {.
340334
desc: "Weak subjectivity checkpoint in the format block_root:epoch_number"
341335
name: "weak-subjectivity-checkpoint" .}: Option[Checkpoint]

beacon_chain/conf_light_client.nim

-6
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@ type LightClientConf* = object
100100
defaultValue: false
101101
name: "enr-auto-update" .}: bool
102102

103-
enableYamux* {.
104-
hidden
105-
desc: "Enable the Yamux multiplexer"
106-
defaultValue: false
107-
name: "debug-enable-yamux" .}: bool
108-
109103
agentString* {.
110104
defaultValue: "nimbus",
111105
desc: "Node agent string which is used as identifier in network"

beacon_chain/networking/eth2_network.nim

+1-5
Original file line numberDiff line numberDiff line change
@@ -2249,11 +2249,7 @@ proc newBeaconSwitch(config: BeaconNodeConf | LightClientConf,
22492249
rng: ref HmacDrbgContext): Switch {.raises: [CatchableError].} =
22502250
let service: Service = WildcardAddressResolverService.new()
22512251

2252-
var sb =
2253-
if config.enableYamux:
2254-
SwitchBuilder.new().withYamux()
2255-
else:
2256-
SwitchBuilder.new()
2252+
var sb = SwitchBuilder.new()
22572253
# Order of multiplexers matters, the first will be default
22582254

22592255
sb

0 commit comments

Comments
 (0)