Merge branch 'new-hardfork-dev' of https://github.com/tronprotocol/java-tron into new-hardfork-dev

Author: lvs007

framework/src/main/java/org/tron/common/entity/NodeInfo.java

@@ -504,7 +504,6 @@ public static class ConfigNodeInfo {
 
     /*node information*/
     private String codeVersion;
-    private String versionName;
     private String versionNum;
     private String p2pVersion;
     private int listenPort;
@@ -534,14 +533,6 @@ public ConfigNodeInfo setCodeVersion(String codeVersion) {
       return this;
     }
 
-    public String getVersionName() {
-      return versionName;
-    }
-
-    public void setVersionName(String versionName) {
-      this.versionName = versionName;
-    }
-
     public String getVersionNum() {
       return versionNum;
     }

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -1456,7 +1456,6 @@ private static void logConfig() {
     logger.info("Backup priority: {}", args.getBackupPriority());
     logger.info("************************ Code version *************************");
     logger.info("Code version : {}", Version.getVersion());
-    logger.info("Version name: {}", Version.versionName);
     logger.info("Version code: {}", Version.versionCode);
     logger.info("************************ DB config *************************");
     logger.info("DB version : {}", args.getStorage().getDbVersion());

framework/src/main/java/org/tron/core/services/NodeInfoService.java

@@ -165,7 +165,6 @@ private void setConnectInfo(NodeInfo nodeInfo) {
   private void setConfigNodeInfo(NodeInfo nodeInfo) {
     ConfigNodeInfo configNodeInfo = new ConfigNodeInfo();
     configNodeInfo.setCodeVersion(Version.getVersion());
-    configNodeInfo.setVersionName(Version.versionName);
     configNodeInfo.setVersionNum(Version.versionCode);
     configNodeInfo.setP2pVersion(String.valueOf(args.getNodeP2pVersion()));
     configNodeInfo.setListenPort(args.getNodeListenPort());