feat(net): optimize p2p exception type description

Author: xxo1shine

common/src/main/java/org/tron/core/exception/P2pException.java

@@ -50,8 +50,8 @@ public enum TypeEnum {
     TRX_EXE_FAILED(12, "trx exe failed"),
     DB_ITEM_NOT_FOUND(13, "DB item not found"),
     PROTOBUF_ERROR(14, "protobuf inconsistent"),
-    SIGN_ERROR(15, "sign error"),
-    CALC_MERKLE_ROOT_FAILED(16, "calc merkle root failed"),
+    BLOCK_SIGN_ERROR(15, "block sign error"),
+    BLOCK_MERKLE_ERROR(16, "block merkle error"),
 
     DEFAULT(100, "default exception");
 

framework/src/main/java/org/tron/core/net/TronNetDelegate.java

@@ -285,7 +285,7 @@ public void processBlock(BlockCapsule block, boolean isSync) throws P2pException
         logger.error("Process block failed, {}, reason: {}", blockId.getString(), e.getMessage());
         if (e instanceof BadBlockException
                 && ((BadBlockException) e).getType().equals(CALC_MERKLE_ROOT_FAILED)) {
-          throw new P2pException(TypeEnum.CALC_MERKLE_ROOT_FAILED, e);
+          throw new P2pException(TypeEnum.BLOCK_MERKLE_ERROR, e);
         } else {
           throw new P2pException(TypeEnum.BAD_BLOCK, e);
         }
@@ -318,10 +318,10 @@ public void validSignature(BlockCapsule block) throws P2pException {
     try {
       if (!block.validateSignature(dbManager.getDynamicPropertiesStore(),
               dbManager.getAccountStore())) {
-        throw new P2pException(TypeEnum.SIGN_ERROR, "valid signature failed.");
+        throw new P2pException(TypeEnum.BLOCK_SIGN_ERROR, "valid signature failed.");
       }
     } catch (ValidateSignatureException e) {
-      throw new P2pException(TypeEnum.SIGN_ERROR, e);
+      throw new P2pException(TypeEnum.BLOCK_SIGN_ERROR, e);
     }
   }
 

framework/src/main/java/org/tron/core/net/service/sync/SyncService.java

@@ -1,8 +1,6 @@
 package org.tron.core.net.service.sync;
 
 import static org.tron.core.config.Parameter.NetConstants.MAX_BLOCK_FETCH_PER_PEER;
-import static org.tron.core.exception.P2pException.TypeEnum.CALC_MERKLE_ROOT_FAILED;
-import static org.tron.core.exception.P2pException.TypeEnum.SIGN_ERROR;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -289,8 +287,8 @@ private void processSyncBlock(BlockCapsule block, PeerConnection peerConnection)
     } catch (P2pException p2pException) {
       logger.error("Process sync block {} failed, type: {}",
               blockId.getString(), p2pException.getType());
-      attackFlag = p2pException.getType().equals(SIGN_ERROR)
-              || p2pException.getType().equals(CALC_MERKLE_ROOT_FAILED);
+      attackFlag = p2pException.getType().equals(TypeEnum.BLOCK_SIGN_ERROR)
+              || p2pException.getType().equals(TypeEnum.BLOCK_MERKLE_ERROR);
       flag = false;
     } catch (Exception e) {
       logger.error("Process sync block {} failed", blockId.getString(), e);