Merge branch 'tronprotocol:release_v4.7.2' into release_v4.7.2

Author: lxcmyf

framework/src/main/java/org/tron/core/net/service/nodepersist/NodePersistService.java

@@ -4,34 +4,32 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.JsonUtil;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.BytesCapsule;
-import org.tron.core.config.args.Args;
 import org.tron.core.net.TronNetService;
 import org.tron.p2p.discover.Node;
 
 @Slf4j(topic = "net")
 @Component
 public class NodePersistService {
   private static final byte[] DB_KEY_PEERS = "peers".getBytes();
-  private static final long DB_COMMIT_RATE = 1 * 60 * 1000L;
+  private static final long DB_COMMIT_RATE = 60 * 1000L;
   private static final int MAX_NODES_WRITE_TO_DB = 30;
-
-  private boolean isNodePersist = Args.getInstance().isNodeDiscoveryPersist();
-
-  private ChainBaseManager chainBaseManager = ChainBaseManager.getInstance();
-
+  private final boolean isNodePersist = CommonParameter.getInstance().isNodeDiscoveryPersist();
+  private final ChainBaseManager chainBaseManager = ChainBaseManager.getInstance();
   private Timer nodePersistTaskTimer;
 
   public void init() {
-    nodePersistTaskTimer = new Timer("NodePersistTaskTimer");
     if (isNodePersist) {
+      nodePersistTaskTimer = new Timer("NodePersistTaskTimer");
       nodePersistTaskTimer.scheduleAtFixedRate(new TimerTask() {
         @Override
         public void run() {
@@ -42,6 +40,9 @@ public void run() {
   }
 
   public void close() {
+    if (Objects.isNull(nodePersistTaskTimer)) {
+      return;
+    }
     try {
       nodePersistTaskTimer.cancel();
     } catch (Exception e) {

framework/src/test/java/org/tron/common/utils/Sha256HashTest.java

@@ -3,8 +3,8 @@
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.IntStream;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tron.common.parameter.CommonParameter;
 
 public class Sha256HashTest {
@@ -17,10 +17,10 @@ public void testHash() {
         .getInstance().isECKeyCryptoEngine(), input);
     byte[] hash1 = Sha256Hash.hash(CommonParameter
         .getInstance().isECKeyCryptoEngine(), hash0);
-    Assert.assertEquals(hash0, ByteArray
-        .fromHexString("CD5D4A7E8BE869C00E17F8F7712F41DBE2DDBD4D8EC36A7280CD578863717084"));
-    Assert.assertEquals(hash1, ByteArray
-        .fromHexString("10AE21E887E8FE30C591A22A5F8BB20EB32B2A739486DC5F3810E00BBDB58C5C"));
+    Assert.assertEquals(Arrays.toString(hash0), Arrays.toString(ByteArray
+        .fromHexString("CD5D4A7E8BE869C00E17F8F7712F41DBE2DDBD4D8EC36A7280CD578863717084")));
+    Assert.assertEquals(Arrays.toString(hash1), Arrays.toString(ByteArray
+        .fromHexString("10AE21E887E8FE30C591A22A5F8BB20EB32B2A739486DC5F3810E00BBDB58C5C")));
 
   }
 
@@ -40,7 +40,7 @@ public void testMultiThreadingHash() {
               countAll.incrementAndGet();
               if (!Arrays.equals(hash, hash0)) {
                 countFailed.incrementAndGet();
-                Assert.assertTrue(false);
+                Assert.fail();
               }
             }
           });

framework/src/test/java/org/tron/core/services/http/BroadcastServletTest.java

@@ -57,10 +57,9 @@ public static void init() {
   /**
    * set up.
    *
-   * @throws InterruptedException .
    */
   @Before
-  public void setUp() throws InterruptedException {
+  public void setUp() {
     broadcastServlet = new BroadcastServlet();
     this.request = mock(HttpServletRequest.class);
     this.response = mock(HttpServletResponse.class);
@@ -115,7 +114,7 @@ public void testDoPost() throws IOException {
         + "eapis.com/protocol.TransferContract\"},\"type\":\"TransferCon"
         + "tract\"}],\"ref_block_bytes\":\"267e\",\"ref_block_hash\":\"9a447d222e8"
         + "de9f2\",\"expiration\":1530893064000,\"timestamp\":1530893006233}}";
-    httpUrlConnection.setRequestProperty("Content-Length", "" + postData.length());
+    httpUrlConnection.setRequestProperty("Content-Length", String.valueOf(postData.length()));
 
     when(httpUrlConnection.getOutputStream()).thenReturn(outContent);
     OutputStreamWriter out = new OutputStreamWriter(httpUrlConnection.getOutputStream(),
@@ -146,8 +145,8 @@ public void testDoPost() throws IOException {
     InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream);
     BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
 
-    StringBuffer sb = new StringBuffer();
-    String text = null;
+    StringBuilder sb = new StringBuilder();
+    String text;
     while ((text = bufferedReader.readLine()) != null) {
       sb.append(text);
     }

framework/src/test/java/org/tron/core/services/ratelimiter/adaptor/AdaptorTest.java

@@ -5,7 +5,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
 import org.junit.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 import org.tron.common.utils.ReflectUtils;
 import org.tron.core.services.ratelimiter.adapter.GlobalPreemptibleAdapter;
 import org.tron.core.services.ratelimiter.adapter.IPQPSRateLimiterAdapter;
@@ -23,20 +23,19 @@ public void testStrategy() {
     IPQpsStrategy strategy1 = (IPQpsStrategy) ReflectUtils.getFieldObject(adapter1,
         "strategy");
 
-    Assert.assertTrue(Double.valueOf(
+    Assert.assertEquals(5.0d, Double.parseDouble(
         ReflectUtils.getFieldValue(strategy1.getMapParams().get("qps"),
-            "value").toString())
-        == 5.0d);
-    Assert.assertTrue(strategy1.getMapParams().get("notExist") == null);
+            "value").toString()), 0.0);
+    Assert.assertNull(strategy1.getMapParams().get("notExist"));
 
     String paramString2 = "qps=5xyz";
     IPQPSRateLimiterAdapter adapter2 = new IPQPSRateLimiterAdapter(paramString2);
     IPQpsStrategy strategy2 = (IPQpsStrategy) ReflectUtils.getFieldObject(adapter2,
         "strategy");
 
-    Assert.assertTrue(Double.valueOf(
+    Assert.assertEquals(IPQpsStrategy.DEFAULT_IPQPS, Double.valueOf(
         ReflectUtils.getFieldValue(strategy2.getMapParams().get("qps"),
-            "value").toString()).equals(IPQpsStrategy.DEFAULT_IPQPS));
+            "value").toString()));
   }
 
   @Test
@@ -46,9 +45,9 @@ public void testIPQPSRateLimiterAdapter() {
 
     IPQpsStrategy strategy = (IPQpsStrategy) ReflectUtils.getFieldObject(adapter,
         "strategy");
-    Assert.assertTrue(Double
-        .valueOf(ReflectUtils.getFieldValue(strategy.getMapParams().get("qps"),
-            "value").toString()) == 5.0d);
+    Assert.assertEquals(5.0d, Double
+        .parseDouble(ReflectUtils.getFieldValue(strategy.getMapParams().get("qps"),
+            "value").toString()), 0.0);
 
     long t0 = System.currentTimeMillis();
     for (int i = 0; i < 20; i++) {
@@ -61,15 +60,15 @@ public void testIPQPSRateLimiterAdapter() {
     for (int i = 0; i < 20; i++) {
       if (i % 2 == 0) {
         strategy.acquire("1.2.3.4");
-      } else if (i % 2 == 1) {
+      } else {
         strategy.acquire("4.3.2.1");
       }
     }
     t1 = System.currentTimeMillis();
     Assert.assertTrue(t1 - t0 > 1500);
     Cache<String, RateLimiter> ipLimiter = (Cache<String, RateLimiter>) ReflectUtils
         .getFieldObject(strategy, "ipLimiter");
-    Assert.assertTrue(ipLimiter.size() == 2);
+    Assert.assertEquals(2, ipLimiter.size());
   }
 
   @Test
@@ -78,9 +77,9 @@ public void testGlobalPreemptibleAdapter() {
     GlobalPreemptibleAdapter adapter1 = new GlobalPreemptibleAdapter(paramString1);
     GlobalPreemptibleStrategy strategy1 = (GlobalPreemptibleStrategy) ReflectUtils
         .getFieldObject(adapter1, "strategy");
-    Assert.assertTrue(Integer.valueOf(
+    Assert.assertEquals(1, Integer.parseInt(
         ReflectUtils.getFieldValue(strategy1.getMapParams().get("permit"),
-            "value").toString()) == 1);
+            "value").toString()));
     boolean first = strategy1.acquire();
     Assert.assertTrue(first);
 
@@ -95,9 +94,9 @@ public void testGlobalPreemptibleAdapter() {
     GlobalPreemptibleAdapter adapter2 = new GlobalPreemptibleAdapter(paramString2);
     GlobalPreemptibleStrategy strategy2 = (GlobalPreemptibleStrategy) ReflectUtils
         .getFieldObject(adapter2, "strategy");
-    Assert.assertTrue(Integer.valueOf(
+    Assert.assertEquals(3, Integer.parseInt(
         ReflectUtils.getFieldValue(strategy2.getMapParams().get("permit"),
-            "value").toString()) == 3);
+            "value").toString()));
 
     first = strategy2.acquire();
     Assert.assertTrue(first);
@@ -114,11 +113,11 @@ public void testGlobalPreemptibleAdapter() {
     Assert.assertTrue(fourAfterOneRelease);
 
     Semaphore sp = (Semaphore) ReflectUtils.getFieldObject(strategy2, "sp");
-    Assert.assertTrue(sp.availablePermits() == 0);
+    Assert.assertEquals(0, sp.availablePermits());
     strategy2.release();
     strategy2.release();
     strategy2.release();
-    Assert.assertTrue(sp.availablePermits() == 3);
+    Assert.assertEquals(3, sp.availablePermits());
 
   }
 
@@ -128,9 +127,9 @@ public void testQpsRateLimiterAdapter() {
     QpsRateLimiterAdapter adapter = new QpsRateLimiterAdapter(paramString);
 
     QpsStrategy strategy = (QpsStrategy) ReflectUtils.getFieldObject(adapter, "strategy");
-    Assert.assertTrue(Double
-        .valueOf(ReflectUtils.getFieldValue(strategy.getMapParams().get("qps"),
-            "value").toString()) == 5);
+    Assert.assertEquals(5, Double
+        .parseDouble(ReflectUtils.getFieldValue(strategy.getMapParams().get("qps"),
+            "value").toString()), 0.0);
     strategy.acquire();
 
     long t0 = System.currentTimeMillis();