From 6a1e001ea34ae5f993c7fc66e75cd3ec53fe1dbc Mon Sep 17 00:00:00 2001 From: jiangyuanshu <317787106@qq.com> Date: Tue, 22 Aug 2023 14:45:16 +0800 Subject: [PATCH 1/6] delete four unused paramaters in Args --- .../common/parameter/CommonParameter.java | 27 ++++++++++--------- .../src/main/java/org/tron/core/Constant.java | 4 +-- .../java/org/tron/core/config/args/Args.java | 27 ++++++++++--------- .../org/tron/common/config/args/ArgsTest.java | 5 ++-- 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/common/src/main/java/org/tron/common/parameter/CommonParameter.java b/common/src/main/java/org/tron/common/parameter/CommonParameter.java index 0c8e6f74ee3..e89c512eb5e 100644 --- a/common/src/main/java/org/tron/common/parameter/CommonParameter.java +++ b/common/src/main/java/org/tron/common/parameter/CommonParameter.java @@ -18,6 +18,7 @@ import org.tron.core.config.args.Overlay; import org.tron.core.config.args.SeedNode; import org.tron.core.config.args.Storage; +import org.tron.p2p.P2pConfig; import org.tron.p2p.dns.update.PublishConfig; public class CommonParameter { @@ -169,6 +170,8 @@ public class CommonParameter { @Setter public int minParticipationRate; @Getter + public P2pConfig p2pConfig; + @Getter @Setter public int nodeListenPort; @Getter @@ -177,21 +180,21 @@ public class CommonParameter { @Getter @Setter public String nodeExternalIp; - @Getter - @Setter - public boolean nodeDiscoveryPublicHomeNode; - @Getter - @Setter - public long nodeDiscoveryPingTimeout; - @Getter - @Setter - public long nodeP2pPingInterval; +// @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 String p2pNodeId; @Getter @Setter public boolean nodeEnableIpv6 = false; diff --git a/common/src/main/java/org/tron/core/Constant.java b/common/src/main/java/org/tron/core/Constant.java index dea5a2534b9..4987c070218 100644 --- a/common/src/main/java/org/tron/core/Constant.java +++ b/common/src/main/java/org/tron/core/Constant.java @@ -101,8 +101,8 @@ 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_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"; diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java index 040a06c6a02..5af82f132a4 100644 --- a/framework/src/main/java/org/tron/core/config/args/Args.java +++ b/framework/src/main/java/org/tron/core/config/args/Args.java @@ -73,6 +73,7 @@ import org.tron.core.store.AccountStore; import org.tron.keystore.Credentials; import org.tron.keystore.WalletUtils; +import org.tron.p2p.P2pConfig; import org.tron.p2p.dns.update.DnsType; import org.tron.p2p.dns.update.PublishConfig; import org.tron.p2p.utils.NetUtil; @@ -140,9 +141,9 @@ public static void clearParam() { PARAMETER.nodeListenPort = 0; PARAMETER.nodeDiscoveryBindIp = ""; PARAMETER.nodeExternalIp = ""; - PARAMETER.nodeDiscoveryPublicHomeNode = false; - PARAMETER.nodeDiscoveryPingTimeout = 15000; - PARAMETER.nodeP2pPingInterval = 0L; + // PARAMETER.nodeDiscoveryPublicHomeNode = false; + // PARAMETER.nodeDiscoveryPingTimeout = 15000; + // PARAMETER.nodeP2pPingInterval = 0L; PARAMETER.nodeP2pVersion = 0; PARAMETER.nodeEnableIpv6 = false; PARAMETER.dnsTreeUrls = new ArrayList<>(); @@ -170,7 +171,7 @@ public static void clearParam() { PARAMETER.forbidTransferToContract = 0; PARAMETER.tcpNettyWorkThreadNum = 0; PARAMETER.udpNettyWorkThreadNum = 0; - PARAMETER.p2pNodeId = ""; + // PARAMETER.p2pNodeId = ""; PARAMETER.solidityNode = false; PARAMETER.trustNodeAddr = ""; PARAMETER.walletExtensionApi = false; @@ -639,17 +640,17 @@ 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.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.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.nodeP2pPingInterval = + // config.hasPath(Constant.NODE_P2P_PING_INTERVAL) + // ? config.getLong(Constant.NODE_P2P_PING_INTERVAL) : 0; PARAMETER.nodeP2pVersion = config.hasPath(Constant.NODE_P2P_VERSION) diff --git a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java index 7ad8069db06..17a04421d2d 100644 --- a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java +++ b/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,7 @@ 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().getNodeDiscoveryPingTimeout(), 15_000); Assert.assertEquals(Args.getInstance().getMaxFastForwardNum(), 3); Assert.assertEquals(Args.getInstance().getBlockCacheTimeout(), 60); Assert.assertEquals(Args.getInstance().isNodeDetectEnable(), false); From 45cbda0258d08c665189f73ad5d3ecfa05881dab Mon Sep 17 00:00:00 2001 From: jiangyuanshu <317787106@qq.com> Date: Wed, 23 Aug 2023 18:11:38 +0800 Subject: [PATCH 2/6] feat(net):optimzie code --- common/src/main/java/org/tron/core/Constant.java | 4 ++-- framework/src/test/java/org/tron/core/WalletTest.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/tron/core/Constant.java b/common/src/main/java/org/tron/core/Constant.java index 4987c070218..afe967285ee 100644 --- a/common/src/main/java/org/tron/core/Constant.java +++ b/common/src/main/java/org/tron/core/Constant.java @@ -103,8 +103,8 @@ public class Constant { 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_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"; diff --git a/framework/src/test/java/org/tron/core/WalletTest.java b/framework/src/test/java/org/tron/core/WalletTest.java index 15b51f51edf..25500f13bbe 100644 --- a/framework/src/test/java/org/tron/core/WalletTest.java +++ b/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; @@ -567,6 +568,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() { From 3b2b60eb8bd9f9b29efb21a552a58d450ae89baa Mon Sep 17 00:00:00 2001 From: jiangyuanshu <317787106@qq.com> Date: Wed, 23 Aug 2023 18:13:29 +0800 Subject: [PATCH 3/6] feat(net):optimzie code --- .../main/java/org/tron/common/parameter/CommonParameter.java | 3 --- common/src/main/java/org/tron/core/Constant.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/common/src/main/java/org/tron/common/parameter/CommonParameter.java b/common/src/main/java/org/tron/common/parameter/CommonParameter.java index e89c512eb5e..a8c4991a782 100644 --- a/common/src/main/java/org/tron/common/parameter/CommonParameter.java +++ b/common/src/main/java/org/tron/common/parameter/CommonParameter.java @@ -18,7 +18,6 @@ import org.tron.core.config.args.Overlay; import org.tron.core.config.args.SeedNode; import org.tron.core.config.args.Storage; -import org.tron.p2p.P2pConfig; import org.tron.p2p.dns.update.PublishConfig; public class CommonParameter { @@ -170,8 +169,6 @@ public class CommonParameter { @Setter public int minParticipationRate; @Getter - public P2pConfig p2pConfig; - @Getter @Setter public int nodeListenPort; @Getter diff --git a/common/src/main/java/org/tron/core/Constant.java b/common/src/main/java/org/tron/core/Constant.java index afe967285ee..7a56b7990b6 100644 --- a/common/src/main/java/org/tron/core/Constant.java +++ b/common/src/main/java/org/tron/core/Constant.java @@ -103,7 +103,7 @@ public class Constant { 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"; From e70ef1bca7a722e32cd3ab1c8580cff112197f66 Mon Sep 17 00:00:00 2001 From: jiangyuanshu <317787106@qq.com> Date: Thu, 24 Aug 2023 17:56:42 +0800 Subject: [PATCH 4/6] feat(*):delelte some unuseful code --- .../tron/common/parameter/CommonParameter.java | 12 ------------ common/src/main/java/org/tron/core/Constant.java | 4 ---- .../java/org/tron/core/config/args/Args.java | 16 ---------------- .../org/tron/common/config/args/ArgsTest.java | 1 - 4 files changed, 33 deletions(-) diff --git a/common/src/main/java/org/tron/common/parameter/CommonParameter.java b/common/src/main/java/org/tron/common/parameter/CommonParameter.java index a8c4991a782..3ba55f9b47f 100644 --- a/common/src/main/java/org/tron/common/parameter/CommonParameter.java +++ b/common/src/main/java/org/tron/common/parameter/CommonParameter.java @@ -177,21 +177,9 @@ public class CommonParameter { @Getter @Setter 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; diff --git a/common/src/main/java/org/tron/core/Constant.java b/common/src/main/java/org/tron/core/Constant.java index 7a56b7990b6..57db2d59639 100644 --- a/common/src/main/java/org/tron/core/Constant.java +++ b/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"; diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java index 5af82f132a4..e19cf5c95d7 100644 --- a/framework/src/main/java/org/tron/core/config/args/Args.java +++ b/framework/src/main/java/org/tron/core/config/args/Args.java @@ -141,9 +141,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<>(); @@ -171,7 +168,6 @@ public static void clearParam() { PARAMETER.forbidTransferToContract = 0; PARAMETER.tcpNettyWorkThreadNum = 0; PARAMETER.udpNettyWorkThreadNum = 0; - // PARAMETER.p2pNodeId = ""; PARAMETER.solidityNode = false; PARAMETER.trustNodeAddr = ""; PARAMETER.walletExtensionApi = false; @@ -640,18 +636,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; diff --git a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java index 17a04421d2d..1c47599b61a 100644 --- a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java +++ b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java @@ -31,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); From 8efbd8750486cb8bf98a5b9f2fd9e4a194e9a455 Mon Sep 17 00:00:00 2001 From: jiangyuanshu <317787106@qq.com> Date: Mon, 28 Aug 2023 14:43:15 +0800 Subject: [PATCH 5/6] add test case of WalletTest --- .../src/main/java/org/tron/core/config/args/Args.java | 1 - framework/src/test/java/org/tron/core/WalletTest.java | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java index e19cf5c95d7..69dc8d52423 100644 --- a/framework/src/main/java/org/tron/core/config/args/Args.java +++ b/framework/src/main/java/org/tron/core/config/args/Args.java @@ -73,7 +73,6 @@ import org.tron.core.store.AccountStore; import org.tron.keystore.Credentials; import org.tron.keystore.WalletUtils; -import org.tron.p2p.P2pConfig; import org.tron.p2p.dns.update.DnsType; import org.tron.p2p.dns.update.PublishConfig; import org.tron.p2p.utils.NetUtil; diff --git a/framework/src/test/java/org/tron/core/WalletTest.java b/framework/src/test/java/org/tron/core/WalletTest.java index 25500f13bbe..802591d8daa 100644 --- a/framework/src/test/java/org/tron/core/WalletTest.java +++ b/framework/src/test/java/org/tron/core/WalletTest.java @@ -532,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(); From 703cf87407c2c7eb24cc3bd3ff7648e5cc457555 Mon Sep 17 00:00:00 2001 From: jiangyuanshu <317787106@qq.com> Date: Tue, 29 Aug 2023 16:07:17 +0800 Subject: [PATCH 6/6] add test case of WalletTest --- .../test/java/org/tron/core/WalletTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/framework/src/test/java/org/tron/core/WalletTest.java b/framework/src/test/java/org/tron/core/WalletTest.java index 802591d8daa..e1ba2cbee5f 100644 --- a/framework/src/test/java/org/tron/core/WalletTest.java +++ b/framework/src/test/java/org/tron/core/WalletTest.java @@ -552,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();