optimize trustNodeAddr

Author: 317787106

common/src/main/java/org/tron/core/config/args/NodeConfig.java

@@ -418,10 +418,12 @@ private void postProcess() {
       agreeNodeCount = MAX_ACTIVE_WITNESS_NUM;
     }
 
+    // dynamicConfigCheckInterval: minimum 600
     if (dynamicConfig.checkInterval <= 0) {
       dynamicConfig.checkInterval = 600;
     }
 
+    // maxTrxCacheSize: minimum 2000
     if (maxTrxCacheSize < 2000) {
       maxTrxCacheSize = 2000;
     }

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

@@ -610,10 +610,7 @@ private static void applyNodeConfig(NodeConfig nc) {
     PARAMETER.maxHttpConnectNumber = nc.getMaxHttpConnectNumber();
     PARAMETER.netMaxTrxPerSecond = nc.getNetMaxTrxPerSecond();
 
-    if (StringUtils.isEmpty(PARAMETER.trustNodeAddr)) {
-      String trustNode = nc.getTrustNode();
-      PARAMETER.trustNodeAddr = StringUtils.isEmpty(trustNode) ? null : trustNode;
-    }
+    PARAMETER.trustNodeAddr = nc.getTrustNode();
 
     PARAMETER.validateSignThreadNum = nc.getValidateSignThreadNum();
     PARAMETER.walletExtensionApi = nc.isWalletExtensionApi();

framework/src/main/java/org/tron/program/FullNode.java

@@ -1,8 +1,8 @@
 package org.tron.program;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.util.ObjectUtils;
 import org.tron.common.application.Application;
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
@@ -35,7 +35,7 @@ public static void main(String[] args) {
     }
     if (parameter.isSolidityNode()) {
       logger.info("Solidity node is running.");
-      if (ObjectUtils.isEmpty(parameter.getTrustNodeAddr())) {
+      if (StringUtils.isEmpty(parameter.getTrustNodeAddr())) {
         throw new TronError(new IllegalArgumentException("Trust node is not set."),
             TronError.ErrCode.SOLID_NODE_INIT);
       }