test(net): modify HandShakeServiceTest

Author: 317787106

framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java

@@ -35,22 +35,19 @@ public void startHandshake(PeerConnection peer) {
 
   public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
     if (peer.getHelloMessageReceive() != null) {
-      System.out.println("11111111111");
       logger.warn("Peer {} receive dup hello message", peer.getInetSocketAddress());
       peer.disconnect(ReasonCode.BAD_PROTOCOL);
       return;
     }
 
     TronNetService.getP2pService().updateNodeId(peer.getChannel(), msg.getFrom().getHexId());
     if (peer.isDisconnect()) {
-      System.out.println("222222222");
       logger.info("Duplicate Peer {}", peer.getInetSocketAddress());
       peer.disconnect(ReasonCode.DUPLICATE_PEER);
       return;
     }
 
     if (!msg.valid()) {
-      System.out.println("333333333");
       logger.warn("Peer {} invalid hello message parameters, "
                       + "GenesisBlockId: {}, SolidBlockId: {}, HeadBlockId: {}",
               peer.getInetSocketAddress(),
@@ -64,23 +61,20 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
     peer.setAddress(msg.getHelloMessage().getAddress());
 
     if (!relayService.checkHelloMessage(msg, peer.getChannel())) {
-      System.out.println("44444444444");
       peer.disconnect(ReasonCode.UNEXPECTED_IDENTITY);
       return;
     }
 
     long headBlockNum = chainBaseManager.getHeadBlockNum();
     long lowestBlockNum = msg.getLowestBlockNum();
     if (lowestBlockNum > headBlockNum) {
-      System.out.println("55555555555");
       logger.info("Peer {} miss block, lowestBlockNum:{}, headBlockNum:{}",
               peer.getInetSocketAddress(), lowestBlockNum, headBlockNum);
       peer.disconnect(ReasonCode.LIGHT_NODE_SYNC_FAIL);
       return;
     }
 
     if (msg.getVersion() != Args.getInstance().getNodeP2pVersion()) {
-      System.out.println("6666666666");
       logger.info("Peer {} different p2p version, peer->{}, me->{}",
               peer.getInetSocketAddress(), msg.getVersion(),
               Args.getInstance().getNodeP2pVersion());
@@ -90,7 +84,6 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
 
     if (!Arrays.equals(chainBaseManager.getGenesisBlockId().getBytes(),
             msg.getGenesisBlockId().getBytes())) {
-      System.out.println("7777777777");
       logger.info("Peer {} different genesis block, peer->{}, me->{}",
               peer.getInetSocketAddress(),
               msg.getGenesisBlockId().getString(),
@@ -101,7 +94,6 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
 
     if (chainBaseManager.getSolidBlockId().getNum() >= msg.getSolidBlockId().getNum()
             && !chainBaseManager.containBlockInMainChain(msg.getSolidBlockId())) {
-      System.out.println("88888888888");
       logger.info("Peer {} different solid block, peer->{}, me->{}",
               peer.getInetSocketAddress(),
               msg.getSolidBlockId().getString(),
@@ -112,15 +104,13 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
 
     if (msg.getHeadBlockId().getNum() < chainBaseManager.getHeadBlockId().getNum()
         && peer.getInetSocketAddress().equals(effectiveCheckService.getCur())) {
-      System.out.println("99999999999");
       logger.info("Peer's head block {} is below than we, peer->{}, me->{}",
           peer.getInetSocketAddress(), msg.getHeadBlockId().getNum(),
           chainBaseManager.getHeadBlockId().getNum());
       peer.disconnect(ReasonCode.BELOW_THAN_ME);
       return;
     }
 
-    System.out.println("000000000");
     peer.setHelloMessageReceive(msg);
 
     peer.getChannel().updateAvgLatency(

framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java

@@ -11,6 +11,7 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Random;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
@@ -209,14 +210,17 @@ public void testLowAndGenesisBlockNum() throws NoSuchMethodException {
       Assert.fail();
     }
 
-    //solidityBlock is small than us, but not contained
+    //solidityBlock <= us, but not contained
     builder = getHelloMessageBuilder(node2, System.currentTimeMillis(),
         ChainBaseManager.getChainBaseManager());
     BlockCapsule.BlockId sid = ChainBaseManager.getChainBaseManager().getSolidBlockId();
+
+    Random gen = new Random();
+    byte[] randomHash = new byte[Sha256Hash.LENGTH];
+    gen.nextBytes(randomHash);
+
     Protocol.HelloMessage.BlockId sBlockId = Protocol.HelloMessage.BlockId.newBuilder()
-        .setHash(ByteString.copyFrom(
-            ByteArray.fromHex("0304f784e4e7bae517bcab94c3e0c9214fb4ac7ff9d7d5a937d1f40031f87b81")
-                .getBytes()))
+        .setHash(ByteString.copyFrom(randomHash))
         .setNumber(sid.getNum())
         .build();
     builder.setSolidBlockId(sBlockId);