From ec46f1e6e4b6375bb098e33dc7cb779a143705f8 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 25 Feb 2022 11:44:47 +0400 Subject: [PATCH] fix prioritization of stream muxers --- core/node/libp2p/libp2p.go | 4 ++-- core/node/libp2p/sec.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/node/libp2p/libp2p.go b/core/node/libp2p/libp2p.go index 3659b3c61..309490bdc 100644 --- a/core/node/libp2p/libp2p.go +++ b/core/node/libp2p/libp2p.go @@ -58,7 +58,7 @@ type priorityOption struct { func prioritizeOptions(opts []priorityOption) libp2p.Option { type popt struct { - priority int64 + priority int64 // lower priority values mean higher priority opt libp2p.Option } enabledOptions := make([]popt, 0, len(opts)) @@ -71,7 +71,7 @@ func prioritizeOptions(opts []priorityOption) libp2p.Option { } } sort.Slice(enabledOptions, func(i, j int) bool { - return enabledOptions[i].priority > enabledOptions[j].priority + return enabledOptions[i].priority < enabledOptions[j].priority }) p2pOpts := make([]libp2p.Option, len(enabledOptions)) for i, opt := range enabledOptions { diff --git a/core/node/libp2p/sec.go b/core/node/libp2p/sec.go index 65b440ec4..bef2efe47 100644 --- a/core/node/libp2p/sec.go +++ b/core/node/libp2p/sec.go @@ -30,11 +30,11 @@ func Security(enabled bool, tptConfig config.Transports) interface{} { return func() (opts Libp2pOpts) { opts.Opts = append(opts.Opts, prioritizeOptions([]priorityOption{{ priority: tptConfig.Security.TLS, - defaultPriority: 100, + defaultPriority: 200, opt: libp2p.Security(tls.ID, tls.New), }, { priority: tptConfig.Security.Noise, - defaultPriority: 300, + defaultPriority: 100, opt: libp2p.Security(noise.ID, noise.New), }})) return opts