Fix pipeline initialization

wavesplatform · Jun 7, 2024 · f69c34a · f69c34a
1 parent 54731fe
commit f69c34a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/node/src/main/scala/com/wavesplatform/network/NetworkServer.scala b/node/src/main/scala/com/wavesplatform/network/NetworkServer.scala
@@ -39,7 +39,7 @@ object NetworkServer extends ScorexLogging {
       peerDatabase: PeerDatabase,
       allChannels: ChannelGroup,
       peerInfo: ConcurrentHashMap[Channel, PeerInfo],
-      protocolSpecificPipeline: Seq[ChannelHandlerAdapter],
+      protocolSpecificPipeline: => Seq[ChannelHandlerAdapter],
   ): NetworkServer = {
     @volatile var shutdownInitiated = false
 

diff --git a/node/src/main/scala/com/wavesplatform/network/NetworkServerL1.scala b/node/src/main/scala/com/wavesplatform/network/NetworkServerL1.scala
@@ -2,7 +2,7 @@ package com.wavesplatform.network
 
 import com.wavesplatform.settings.{Constants, WavesSettings}
 import com.wavesplatform.transaction.LastBlockInfo
-import io.netty.channel.{Channel, ChannelHandlerAdapter}
+import io.netty.channel.Channel
 import io.netty.channel.group.ChannelGroup
 import monix.reactive.Observable
 
@@ -24,26 +24,27 @@ object NetworkServerL1 {
     val peerSynchronizer = if (settings.networkSettings.enablePeersExchange) {
       new PeerSynchronizer(peerDatabase, settings.networkSettings.peersBroadcastInterval)
     } else PeerSynchronizer.Disabled
-
-    val protocolSpecificPipeline: Seq[ChannelHandlerAdapter] =
-      Seq(
-        new LegacyFrameCodecL1(peerDatabase, settings.networkSettings.receivedTxsCacheTimeout),
-        new TrafficWatcher,
-        new DiscardingHandler(lastBlockInfos.map(_.ready), settings.enableLightMode),
-        new MessageCodecL1(peerDatabase),
-        new TrafficLoggerL1(settings.networkSettings.trafficLogger),
-        peerSynchronizer,
-        historyReplier,
-        messageObserver
-      )
+    val trafficWatcher    = new TrafficWatcher
+    val discardingHandler = new DiscardingHandler(lastBlockInfos.map(_.ready), settings.enableLightMode)
+    val messageCodec      = new MessageCodecL1(peerDatabase)
+    val trafficLogger     = new TrafficLoggerL1(settings.networkSettings.trafficLogger)
 
     NetworkServer(
       applicationName,
       settings.networkSettings,
       peerDatabase,
       allChannels,
       peerInfo,
-      protocolSpecificPipeline,
+      Seq(
+        new LegacyFrameCodecL1(peerDatabase, settings.networkSettings.receivedTxsCacheTimeout),
+        trafficWatcher,
+        discardingHandler,
+        messageCodec,
+        trafficLogger,
+        peerSynchronizer,
+        historyReplier,
+        messageObserver
+      )
     )
   }
 }