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

lxcmyf · lxcmyf · commit feb946dc43c7 · 2023-04-18T17:07:51.000+08:00
diff --git a/framework/src/main/java/org/tron/core/net/service/nodepersist/NodePersistService.java b/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) {
diff --git a/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java b/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java
@@ -22,6 +22,7 @@ public class InheritanceTest extends BaseTest {
 
   private static final String OWNER_ADDRESS;
   private RepositoryImpl repository;
+  private static boolean init;
 
   static {
     dbPath = "output_InheritanceTest";
@@ -34,9 +35,13 @@ public class InheritanceTest extends BaseTest {
    */
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     repository = RepositoryImpl.createRoot(StoreFactory.getInstance());
     repository.createAccount(Hex.decode(OWNER_ADDRESS), AccountType.Normal);
     repository.addBalance(Hex.decode(OWNER_ADDRESS), 100000000);
+    init = true;
   }
 
   /**
diff --git a/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java b/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java
@@ -24,6 +24,7 @@ public class InternalTransactionComplexTest extends BaseTest {
   private static final String OWNER_ADDRESS;
   private static Runtime runtime;
   private static RepositoryImpl repository;
+  private static boolean init;
 
   static {
     dbPath = "output_InternalTransactionComplexTest";
@@ -37,9 +38,13 @@ public class InternalTransactionComplexTest extends BaseTest {
    */
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     repository = RepositoryImpl.createRoot(StoreFactory.getInstance());
     repository.createAccount(Hex.decode(OWNER_ADDRESS), AccountType.Normal);
     repository.addBalance(Hex.decode(OWNER_ADDRESS), 100000000);
+    init = true;
   }
 
   /**
diff --git a/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java b/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java
@@ -41,6 +41,7 @@ public class ProgramResultTest extends BaseTest {
   private static final String TRANSFER_TO;
   private static Runtime runtime;
   private static RepositoryImpl repository;
+  private static boolean init;
 
   static {
     dbPath = "output_InternalTransactionComplexTest";
@@ -55,12 +56,16 @@ public class ProgramResultTest extends BaseTest {
    */
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     repository = RepositoryImpl.createRoot(StoreFactory.getInstance());
     repository.createAccount(Hex.decode(OWNER_ADDRESS), AccountType.Normal);
     repository.addBalance(Hex.decode(OWNER_ADDRESS), 100000000);
     repository.createAccount(Hex.decode(TRANSFER_TO), AccountType.Normal);
     repository.addBalance(Hex.decode(TRANSFER_TO), 0);
     repository.commit();
+    init = true;
   }
 
   /**
diff --git a/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java b/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java
@@ -29,6 +29,7 @@ public class RuntimeTransferComplexTest extends BaseTest {
   private static final String TRANSFER_TO;
   private static Runtime runtime;
   private static RepositoryImpl repository;
+  private static boolean init;
 
   static {
     dbPath = "output_RuntimeTransferComplexTest";
@@ -42,12 +43,16 @@ public class RuntimeTransferComplexTest extends BaseTest {
    */
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     repository = RepositoryImpl.createRoot(StoreFactory.getInstance());
     repository.createAccount(Hex.decode(OWNER_ADDRESS), AccountType.Normal);
     repository.addBalance(Hex.decode(OWNER_ADDRESS), 1000000000);
     repository.createAccount(Hex.decode(TRANSFER_TO), AccountType.Normal);
     repository.addBalance(Hex.decode(TRANSFER_TO), 10);
     repository.commit();
+    init = true;
   }
 
   /**
diff --git a/framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeOutOfTimeTest.java b/framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeOutOfTimeTest.java
@@ -64,6 +64,7 @@ public class BandWidthRuntimeOutOfTimeTest extends BaseTest {
 
   private static final String OwnerAddress = "TCWHANtDDdkZCTo2T2peyEq3Eg9c2XB7ut";
   private static final String TriggerOwnerAddress = "TCSgeWapPJhCqgWRxXCKb6jJ5AgNWSGjPA";
+  private static boolean init;
 
   static {
     dbPath = "output_bandwidth_runtime_out_of_time_test";
@@ -84,6 +85,9 @@ public class BandWidthRuntimeOutOfTimeTest extends BaseTest {
    */
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     //init energy
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(1526647828000L);
     dbManager.getDynamicPropertiesStore().saveTotalEnergyWeight(10_000_000L);
@@ -107,6 +111,7 @@ public void init() {
         .put(Commons.decodeFromBase58Check(TriggerOwnerAddress), accountCapsule2);
     dbManager.getDynamicPropertiesStore()
         .saveLatestBlockHeaderTimestamp(System.currentTimeMillis() / 1000);
+    init = true;
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeOutOfTimeWithCheckTest.java b/framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeOutOfTimeWithCheckTest.java
@@ -65,6 +65,7 @@ public class BandWidthRuntimeOutOfTimeWithCheckTest extends BaseTest {
   private static final String indexDirectory = "index_BandWidthRuntimeOutOfTimeTest_test";
   private static final String OwnerAddress = "TCWHANtDDdkZCTo2T2peyEq3Eg9c2XB7ut";
   private static final String TriggerOwnerAddress = "TCSgeWapPJhCqgWRxXCKb6jJ5AgNWSGjPA";
+  private static boolean init;
 
   static {
     dbPath = "output_bandwidth_runtime_out_of_time_with_check_test";
@@ -85,6 +86,9 @@ public class BandWidthRuntimeOutOfTimeWithCheckTest extends BaseTest {
    */
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     //init energy
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(1526647837000L);
     dbManager.getDynamicPropertiesStore().saveTotalEnergyWeight(10_000_000L);
@@ -108,6 +112,7 @@ public void init() {
         .put(Commons.decodeFromBase58Check(TriggerOwnerAddress), accountCapsule2);
     dbManager.getDynamicPropertiesStore()
         .saveLatestBlockHeaderTimestamp(System.currentTimeMillis() / 1000);
+    init = true;
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/common/utils/Sha256HashTest.java b/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();
               }
             }
           });
diff --git a/framework/src/test/java/org/tron/core/WalletTest.java b/framework/src/test/java/org/tron/core/WalletTest.java
@@ -131,6 +131,7 @@ public class WalletTest extends BaseTest {
   private static final String OWNER_ADDRESS;
   private static final String RECEIVER_ADDRESS;
   private static final long initBalance = 43_200_000_000L;
+  private static boolean init;
 
   static {
     dbPath = "output_wallet_test";
@@ -141,11 +142,15 @@ public class WalletTest extends BaseTest {
 
   @Before
   public void before() {
+    initAccountCapsule();
+    if (init) {
+      return;
+    }
     initTransaction();
     initBlock();
-    initAccountCapsule();
     chainBaseManager.getDynamicPropertiesStore().saveLatestBlockHeaderNumber(5);
     chainBaseManager.getDelegatedResourceStore().reset();
+    init = true;
   }
 
   /**
diff --git a/framework/src/test/java/org/tron/core/db/AccountStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountStoreTest.java
@@ -33,6 +33,7 @@ public class AccountStoreTest extends BaseTest {
   private AssetIssueStore assetIssueStore;
   private static byte[] address = TransactionStoreTest.randomBytes(32);
   private static byte[] accountName = TransactionStoreTest.randomBytes(32);
+  private static boolean init;
 
   static {
     dbPath = "output_AccountStore_test";
@@ -48,13 +49,17 @@ public class AccountStoreTest extends BaseTest {
 
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     assetIssueStore = chainBaseManager.getAssetIssueStore();
     dynamicPropertiesStore.saveAllowBlackHoleOptimization(1);
     AccountCapsule accountCapsule = new AccountCapsule(ByteString.copyFrom(address),
         ByteString.copyFrom(accountName),
         AccountType.forNumber(1));
 
     accountStore.put(data, accountCapsule);
+    init = true;
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/core/db/CommonStoreTest.java b/framework/src/test/java/org/tron/core/db/CommonStoreTest.java
diff --git a/framework/src/test/java/org/tron/core/db/TransactionTraceTest.java b/framework/src/test/java/org/tron/core/db/TransactionTraceTest.java
@@ -57,6 +57,7 @@ public class TransactionTraceTest extends BaseTest {
   private static ByteString contractAddress = ByteString.copyFrom(ByteArray.fromInt(2));
   private static String OwnerAddress = "TCWHANtDDdkZCTo2T2peyEq3Eg9c2XB7ut";
   private static String TriggerOwnerAddress = "TCSgeWapPJhCqgWRxXCKb6jJ5AgNWSGjPA";
+  private static boolean init;
 
   static {
     dbPath = "output_TransactionTrace_test";
@@ -77,12 +78,15 @@ public class TransactionTraceTest extends BaseTest {
    */
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     //init energy
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(1526647838000L);
     dbManager.getDynamicPropertiesStore().saveTotalEnergyWeight(100_000L);
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(0);
     VMConfig.initVmHardFork(false);
-
+    init = true;
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/core/db/api/AssetUpdateHelperTest.java b/framework/src/test/java/org/tron/core/db/api/AssetUpdateHelperTest.java
@@ -24,6 +24,7 @@
 public class AssetUpdateHelperTest extends BaseTest {
 
   private static final ByteString assetName = ByteString.copyFrom("assetIssueName".getBytes());
+  private static boolean init;
 
   static {
     dbPath = "output_AssetUpdateHelperTest_test";
@@ -33,7 +34,9 @@ public class AssetUpdateHelperTest extends BaseTest {
 
   @Before
   public void init() {
-
+    if (init) {
+      return;
+    }
     AssetIssueContract contract =
         AssetIssueContract.newBuilder().setName(assetName).setNum(12581).setPrecision(5).build();
     AssetIssueCapsule assetIssueCapsule = new AssetIssueCapsule(contract);
@@ -70,6 +73,7 @@ public void init() {
                 .build());
     chainBaseManager.getAccountStore().put(ByteArray.fromHexString("121212abc"),
         accountCapsule);
+    init = true;
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java b/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java
@@ -27,6 +27,7 @@ public class WalletCursorTest extends BaseTest {
   private Wallet wallet;
   @Resource
   private NodeInfoService nodeInfoService;
+  private static boolean init;
 
   static {
     dbPath = "output_wallet_cursor_test";
@@ -38,13 +39,17 @@ public class WalletCursorTest extends BaseTest {
 
   @Before
   public void init() {
+    if (init) {
+      return;
+    }
     AccountCapsule accountCapsule =
         new AccountCapsule(
             ByteString.copyFromUtf8(OWNER_ADDRESS_ACCOUNT_NAME),
             ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)),
             Protocol.AccountType.Normal,
             10000_000_000L);
     dbManager.getAccountStore().put(accountCapsule.getAddress().toByteArray(), accountCapsule);
+    init = true;
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java
@@ -22,6 +22,7 @@
 @Slf4j
 public class ProposalServiceTest extends BaseTest {
 
+  private static boolean init;
 
   @BeforeClass
   public static void init() {
@@ -32,7 +33,11 @@ public static void init() {
 
   @Before
   public void before() {
+    if (init) {
+      return;
+    }
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderNumber(5);
+    init = true;
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/core/services/http/BroadcastServletTest.java b/framework/src/test/java/org/tron/core/services/http/BroadcastServletTest.java
diff --git a/framework/src/test/java/org/tron/core/services/ratelimiter/adaptor/AdaptorTest.java b/framework/src/test/java/org/tron/core/services/ratelimiter/adaptor/AdaptorTest.java
diff --git a/framework/src/test/java/org/tron/core/zksnark/MerkleTreeTest.java b/framework/src/test/java/org/tron/core/zksnark/MerkleTreeTest.java
diff --git a/framework/src/test/java/org/tron/core/zksnark/NoteEncDecryTest.java b/framework/src/test/java/org/tron/core/zksnark/NoteEncDecryTest.java
