Skip to content

Commit f2e8251

Browse files
committed
Merge branch 'new-hardfork-dev' of https://github.com/tronprotocol/java-tron into new-hardfork-dev
2 parents a8eaf6f + 503d9c3 commit f2e8251

File tree

3 files changed

+0
-11
lines changed

3 files changed

+0
-11
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,6 @@ public static class ConfigNodeInfo {
504504

505505
/*node information*/
506506
private String codeVersion;
507-
private String versionName;
508507
private String versionNum;
509508
private String p2pVersion;
510509
private int listenPort;
@@ -534,14 +533,6 @@ public ConfigNodeInfo setCodeVersion(String codeVersion) {
534533
return this;
535534
}
536535

537-
public String getVersionName() {
538-
return versionName;
539-
}
540-
541-
public void setVersionName(String versionName) {
542-
this.versionName = versionName;
543-
}
544-
545536
public String getVersionNum() {
546537
return versionNum;
547538
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,6 @@ private static void logConfig() {
14561456
logger.info("Backup priority: {}", args.getBackupPriority());
14571457
logger.info("************************ Code version *************************");
14581458
logger.info("Code version : {}", Version.getVersion());
1459-
logger.info("Version name: {}", Version.versionName);
14601459
logger.info("Version code: {}", Version.versionCode);
14611460
logger.info("************************ DB config *************************");
14621461
logger.info("DB version : {}", args.getStorage().getDbVersion());

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ private void setConnectInfo(NodeInfo nodeInfo) {
165165
private void setConfigNodeInfo(NodeInfo nodeInfo) {
166166
ConfigNodeInfo configNodeInfo = new ConfigNodeInfo();
167167
configNodeInfo.setCodeVersion(Version.getVersion());
168-
configNodeInfo.setVersionName(Version.versionName);
169168
configNodeInfo.setVersionNum(Version.versionCode);
170169
configNodeInfo.setP2pVersion(String.valueOf(args.getNodeP2pVersion()));
171170
configNodeInfo.setListenPort(args.getNodeListenPort());

0 commit comments

Comments
 (0)