Merge branch 'main' of github.com:hyperledger/besu into payload-block…

…-with-receipts-refactor
macfarla · Sep 22, 2023 · 26bdfee · 26bdfee
2 parents f0c476e + 5830936
commit 26bdfee
Showing 1 changed file with 39 additions and 39 deletions.
diff --git a/...va/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java b/...va/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java
@@ -97,47 +97,47 @@ protected final void channelRead0(final ChannelHandlerContext ctx, final ByteBuf
       ctx.writeAndFlush(nextMsg.get());
     } else if (handshaker.getStatus() != Handshaker.HandshakeStatus.SUCCESS) {
       LOG.debug("waiting for more bytes");
-    } else {
-
-      final Bytes nodeId = handshaker.partyPubKey().getEncodedBytes();
-      if (!localNode.isReady()) {
-        // If we're handling a connection before the node is fully up, just disconnect
-        LOG.debug("Rejecting connection because local node is not ready {}", nodeId);
-        disconnect(ctx, DisconnectMessage.DisconnectReason.UNKNOWN);
-        return;
-      }
+      return;
+    }
 
-      LOG.trace("Sending framed hello");
-
-      // Exchange keys done
-      final Framer framer = this.framerProvider.buildFramer(handshaker.secrets());
-
-      final ByteToMessageDecoder deFramer =
-          new DeFramer(
-              framer,
-              subProtocols,
-              localNode,
-              expectedPeer,
-              connectionEventDispatcher,
-              connectionFuture,
-              metricsSystem,
-              inboundInitiated);
-
-      ctx.channel()
-          .pipeline()
-          .replace(this, "DeFramer", deFramer)
-          .addBefore("DeFramer", "validate", new ValidateFirstOutboundMessage(framer));
-
-      ctx.writeAndFlush(new OutboundMessage(null, HelloMessage.create(localNode.getPeerInfo())))
-          .addListener(
-              ff -> {
-                if (ff.isSuccess()) {
-                  LOG.trace("Successfully wrote hello message");
-                }
-              });
-      msg.retain();
-      ctx.fireChannelRead(msg);
+    final Bytes nodeId = handshaker.partyPubKey().getEncodedBytes();
+    if (!localNode.isReady()) {
+      // If we're handling a connection before the node is fully up, just disconnect
+      LOG.debug("Rejecting connection because local node is not ready {}", nodeId);
+      disconnect(ctx, DisconnectMessage.DisconnectReason.UNKNOWN);
+      return;
     }
+
+    LOG.trace("Sending framed hello");
+
+    // Exchange keys done
+    final Framer framer = this.framerProvider.buildFramer(handshaker.secrets());
+
+    final ByteToMessageDecoder deFramer =
+        new DeFramer(
+            framer,
+            subProtocols,
+            localNode,
+            expectedPeer,
+            connectionEventDispatcher,
+            connectionFuture,
+            metricsSystem,
+            inboundInitiated);
+
+    ctx.channel()
+        .pipeline()
+        .replace(this, "DeFramer", deFramer)
+        .addBefore("DeFramer", "validate", new ValidateFirstOutboundMessage(framer));
+
+    ctx.writeAndFlush(new OutboundMessage(null, HelloMessage.create(localNode.getPeerInfo())))
+        .addListener(
+            ff -> {
+              if (ff.isSuccess()) {
+                LOG.trace("Successfully wrote hello message");
+              }
+            });
+    msg.retain();
+    ctx.fireChannelRead(msg);
   }
 
   private void disconnect(