Merge pull request #6269 from yanghang8612/revert_reprioritize_old_internal_tx_switches

func(cfg): revert reprioritize for old internal tx switches

Author: CodeNinjaEvan

actuator/src/main/java/org/tron/core/vm/nativecontract/UnfreezeBalanceV2Processor.java

@@ -84,7 +84,7 @@ public void validate(UnfreezeBalanceV2Param param, Repository repo)
 
     if (!checkUnfreezeBalance(accountCapsule, param.getUnfreezeBalance(), param.getResourceType())) {
       throw new ContractValidateException(
-          "Invalid unfreeze_balance, [" + param.getUnfreezeBalance() + "] is too large");
+          "Invalid unfreeze_balance, [" + param.getUnfreezeBalance() + "] is invalid");
     }
   }
 

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

@@ -917,15 +917,13 @@ public static void setParam(final Config config) {
     PARAMETER.vmTrace =
         config.hasPath(Constant.VM_TRACE) && config.getBoolean(Constant.VM_TRACE);
 
-    if (!PARAMETER.saveInternalTx
-        && config.hasPath(Constant.VM_SAVE_INTERNAL_TX)) {
-      PARAMETER.saveInternalTx = config.getBoolean(Constant.VM_SAVE_INTERNAL_TX);
-    }
+    PARAMETER.saveInternalTx =
+        config.hasPath(Constant.VM_SAVE_INTERNAL_TX)
+            && config.getBoolean(Constant.VM_SAVE_INTERNAL_TX);
 
-    if (!PARAMETER.saveFeaturedInternalTx
-        && config.hasPath(Constant.VM_SAVE_FEATURED_INTERNAL_TX)) {
-      PARAMETER.saveFeaturedInternalTx = config.getBoolean(Constant.VM_SAVE_FEATURED_INTERNAL_TX);
-    }
+    PARAMETER.saveFeaturedInternalTx =
+        config.hasPath(Constant.VM_SAVE_FEATURED_INTERNAL_TX)
+            && config.getBoolean(Constant.VM_SAVE_FEATURED_INTERNAL_TX);
 
     if (!PARAMETER.saveCancelAllUnfreezeV2Details
         && config.hasPath(Constant.VM_SAVE_CANCEL_ALL_UNFREEZE_V2_DETAILS)) {

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

@@ -8,6 +8,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.util.encoders.Hex;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.tron.common.runtime.TVMTestResult;
 import org.tron.common.runtime.TvmTestUtils;
@@ -23,6 +24,7 @@
 import org.tron.core.exception.VMIllegalException;
 import org.tron.core.services.NodeInfoService;
 import org.tron.core.services.jsonrpc.TronJsonRpcImpl;
+import org.tron.core.vm.config.ConfigLoader;
 import org.tron.protos.Protocol.Transaction;
 
 
@@ -103,6 +105,11 @@ triggercontract Txxxxxxxxxxx deploy(bytes,uint256) bytes,uint256 false 100000000
 
   */
 
+  @Before
+  public void before() {
+    ConfigLoader.disable = false;
+  }
+
   @Test
   public void testCreate2()
       throws ContractExeException, ReceiptCheckErrException,