Merge pull request #5441 from 317787106/hotfix/delete_unused_args

feat(net): delete four unused paramaters in Args

Author: 317787106

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -179,21 +179,9 @@ public class CommonParameter {
   public String nodeExternalIp;
   @Getter
   @Setter
-  public boolean nodeDiscoveryPublicHomeNode;
-  @Getter
-  @Setter
-  public long nodeDiscoveryPingTimeout;
-  @Getter
-  @Setter
-  public long nodeP2pPingInterval;
-  @Getter
-  @Setter
   public int nodeP2pVersion;
   @Getter
   @Setter
-  public String p2pNodeId;
-  @Getter
-  @Setter
   public boolean nodeEnableIpv6 = false;
   @Getter
   @Setter

common/src/main/java/org/tron/core/Constant.java

@@ -101,10 +101,6 @@ public class Constant {
   public static final String NODE_MAX_CONNECTIONS_WITH_SAME_IP = "node.maxConnectionsWithSameIp";
   public static final String NODE_MIN_PARTICIPATION_RATE = "node.minParticipationRate";
   public static final String NODE_LISTEN_PORT = "node.listen.port";
-  public static final String NODE_DISCOVERY_PUBLIC_HOME_NODE = "node.discovery.public.home.node";
-  public static final String NODE_DISCOVERY_PING_TIMEOUT = "node.discovery.ping.timeout";
-
-  public static final String NODE_P2P_PING_INTERVAL = "node.p2p.pingInterval";
   public static final String NODE_P2P_VERSION = "node.p2p.version";
   public static final String NODE_ENABLE_IPV6  = "node.enableIpv6";
   public static final String NODE_DNS_TREE_URLS = "node.dns.treeUrls";

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

@@ -140,9 +140,6 @@ public static void clearParam() {
     PARAMETER.nodeListenPort = 0;
     PARAMETER.nodeDiscoveryBindIp = "";
     PARAMETER.nodeExternalIp = "";
-    PARAMETER.nodeDiscoveryPublicHomeNode = false;
-    PARAMETER.nodeDiscoveryPingTimeout = 15000;
-    PARAMETER.nodeP2pPingInterval = 0L;
     PARAMETER.nodeP2pVersion = 0;
     PARAMETER.nodeEnableIpv6 = false;
     PARAMETER.dnsTreeUrls = new ArrayList<>();
@@ -170,7 +167,6 @@ public static void clearParam() {
     PARAMETER.forbidTransferToContract = 0;
     PARAMETER.tcpNettyWorkThreadNum = 0;
     PARAMETER.udpNettyWorkThreadNum = 0;
-    PARAMETER.p2pNodeId = "";
     PARAMETER.solidityNode = false;
     PARAMETER.trustNodeAddr = "";
     PARAMETER.walletExtensionApi = false;
@@ -639,18 +635,6 @@ public static void setParam(final String[] args, final String confFileName) {
     bindIp(config);
     externalIp(config);
 
-    PARAMETER.nodeDiscoveryPublicHomeNode =
-        config.hasPath(Constant.NODE_DISCOVERY_PUBLIC_HOME_NODE) && config
-            .getBoolean(Constant.NODE_DISCOVERY_PUBLIC_HOME_NODE);
-
-    PARAMETER.nodeDiscoveryPingTimeout =
-        config.hasPath(Constant.NODE_DISCOVERY_PING_TIMEOUT)
-            ? config.getLong(Constant.NODE_DISCOVERY_PING_TIMEOUT) : 15000;
-
-    PARAMETER.nodeP2pPingInterval =
-        config.hasPath(Constant.NODE_P2P_PING_INTERVAL)
-            ? config.getLong(Constant.NODE_P2P_PING_INTERVAL) : 0;
-
     PARAMETER.nodeP2pVersion =
         config.hasPath(Constant.NODE_P2P_VERSION)
             ? config.getInt(Constant.NODE_P2P_VERSION) : 0;

framework/src/test/java/org/tron/common/config/args/ArgsTest.java

@@ -11,14 +11,13 @@
 import org.tron.core.config.args.Args;
 
 
-
 public class ArgsTest {
 
   private static final String dbPath = "output_arg_test";
 
   @Before
   public void init() {
-    Args.setParam(new String[]{"--output-directory", dbPath, "--p2p-disable", "true",
+    Args.setParam(new String[] {"--output-directory", dbPath, "--p2p-disable", "true",
         "--debug"}, Constant.TEST_CONF);
   }
 
@@ -32,7 +31,6 @@ public void destroy() {
   public void testConfig() {
     Assert.assertEquals(Args.getInstance().getMaxTransactionPendingSize(), 2000);
     Assert.assertEquals(Args.getInstance().getPendingTransactionTimeout(), 60_000);
-    Assert.assertEquals(Args.getInstance().getNodeDiscoveryPingTimeout(), 15_000);
     Assert.assertEquals(Args.getInstance().getMaxFastForwardNum(), 3);
     Assert.assertEquals(Args.getInstance().getBlockCacheTimeout(), 60);
     Assert.assertEquals(Args.getInstance().isNodeDetectEnable(), false);

framework/src/test/java/org/tron/core/WalletTest.java

@@ -42,6 +42,7 @@
 import org.tron.api.GrpcAPI.AssetIssueList;
 import org.tron.api.GrpcAPI.BlockList;
 import org.tron.api.GrpcAPI.ExchangeList;
+import org.tron.api.GrpcAPI.NumberMessage;
 import org.tron.api.GrpcAPI.ProposalList;
 import org.tron.common.BaseTest;
 import org.tron.common.crypto.ECKey;
@@ -531,6 +532,16 @@ public void getPaginatedProposalList() {
 
   }
 
+  @Test
+  public void testGetProposalById() {
+    buildProposal();
+    //
+    Proposal proposal = wallet.getProposalById(ByteString.copyFrom(ByteArray.fromLong(1L)));
+    Assert.assertNotNull(proposal);
+    proposal = wallet.getProposalById(ByteString.copyFrom(ByteArray.fromLong(3L)));
+    Assert.assertNull(proposal);
+  }
+
   @Test
   public void getPaginatedExchangeList() {
     buildExchange();
@@ -541,6 +552,24 @@ public void getPaginatedExchangeList() {
         exchangeList.getExchangesList().get(1).getCreatorAddress().toStringUtf8());
   }
 
+  @Test
+  public void testGetExchangeById() {
+    buildExchange();
+    //
+    Exchange exchange = wallet.getExchangeById(ByteString.copyFrom(ByteArray.fromLong(1L)));
+    Assert.assertNotNull(exchange);
+    exchange = wallet.getExchangeById(ByteString.copyFrom(ByteArray.fromLong(3L)));
+    Assert.assertNull(exchange);
+  }
+
+  @Test
+  public void testGetExchangeList() {
+    buildExchange();
+    //
+    ExchangeList exchangeList = wallet.getExchangeList();
+    Assert.assertEquals(2, exchangeList.getExchangesCount());
+  }
+
   @Test
   public void getBlock() {
     GrpcAPI.BlockReq req = GrpcAPI.BlockReq.getDefaultInstance();
@@ -567,6 +596,12 @@ public void getBlock() {
     assertEquals(block, wallet.getBlock(req));
   }
 
+  @Test
+  public void testGetNextMaintenanceTime() {
+    NumberMessage numberMessage = wallet.getNextMaintenanceTime();
+    Assert.assertEquals(0, numberMessage.getNum());
+  }
+
   //@Test
   public void testChainParameters() {