impr(test): revert changes and optimize those tests in a safer way

Author: yanghang8612

framework/src/test/java/org/tron/common/runtime/vm/BatchValidateSignContractTest.java

@@ -79,7 +79,6 @@ public void staticCallTest() {
 
   @Test
   public void correctionTest() {
-    contract.setConstantCall(true);
     List<Object> signatures = new ArrayList<>();
     List<Object> addresses = new ArrayList<>();
     byte[] hash = Hash.sha3(longData);
@@ -128,7 +127,8 @@ Pair<Boolean, byte[]> validateMultiSign(byte[] hash, List<Object> signatures,
     List<Object> parameters = Arrays.asList("0x" + Hex.toHexString(hash), signatures, addresses);
     byte[] input = Hex.decode(AbiUtil.parseParameters(METHOD_SIGN, parameters));
     contract.getEnergyForData(input);
-    contract.setVmShouldEndInUs(System.nanoTime() / 1000 + 500 * 1000);
+    long maxExecutionTime = 2000; // ms
+    contract.setVmShouldEndInUs(System.nanoTime() / 1000 + maxExecutionTime * 1000);
     Pair<Boolean, byte[]> ret = contract.execute(input);
     logger.info("BytesArray:{}，HexString:{}", Arrays.toString(ret.getValue()),
         Hex.toHexString(ret.getValue()));

framework/src/test/java/org/tron/common/runtime/vm/Create2Test.java

@@ -161,15 +161,15 @@ public void testCreate2()
     long salt = 100L;
     String hexInput = AbiUtil.parseMethod(methodSign, Arrays.asList(testCode, salt));
 
-    TVMTestResult result = null;
-    for (int i = 1; i < 3; i++) {
-      result = TvmTestUtils
-          .triggerContractAndReturnTvmTestResult(Hex.decode(OWNER_ADDRESS),
-              factoryAddress, Hex.decode(hexInput), 0, fee, manager, null);
-      if (result.getRuntime().getRuntimeError() == null) {
-        break;
-      }
-    }
+    long preTime = manager.getDynamicPropertiesStore().getMaxCpuTimeOfOneTx();
+    // set max cpu time to 500
+    manager.getDynamicPropertiesStore().saveMaxCpuTimeOfOneTx(500L);
+    TVMTestResult result = TvmTestUtils
+        .triggerContractAndReturnTvmTestResult(Hex.decode(OWNER_ADDRESS),
+            factoryAddress, Hex.decode(hexInput), 0, fee, manager, null);
+    // restore max cpu time
+    manager.getDynamicPropertiesStore().saveMaxCpuTimeOfOneTx(preTime);
+
     Assert.assertNull(result.getRuntime().getRuntimeError());
 
     byte[] returnValue = result.getRuntime().getResult().getHReturn();