fix(test): some related unit tests

Author: yanghang8612

framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java

@@ -26,7 +26,6 @@
 import org.tron.core.db.Manager;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
-import org.tron.core.vm.config.VMConfig;
 import org.tron.protos.Protocol;
 import org.tron.protos.contract.AssetIssueContractOuterClass;
 import org.tron.protos.contract.SmartContractOuterClass.ClearABIContract;
@@ -68,8 +67,8 @@ public class ClearABIContractActuatorTest {
    */
   @BeforeClass
   public static void init() {
-    VMConfig.initAllowTvmConstantinople(1);
     dbManager = context.getBean(Manager.class);
+    dbManager.getDynamicPropertiesStore().saveAllowTvmConstantinople(1);
   }
 
   /**

framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java

@@ -30,7 +30,6 @@
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.TronException;
-import org.tron.core.vm.config.VMConfig;
 import org.tron.protos.Protocol;
 import org.tron.protos.contract.AssetIssueContractOuterClass;
 import org.tron.protos.contract.SmartContractOuterClass.SmartContract;
@@ -78,7 +77,7 @@ public static void init() {
     Arrays.fill(stats, (byte) 1);
     dbManager.getDynamicPropertiesStore()
         .statsByVersion(ForkBlockVersionConsts.ENERGY_LIMIT, stats);
-    VMConfig.initVmHardFork(true);
+    CommonParameter.getInstance().setBlockNumForEnergyLimit(0);
   }
 
   /**
@@ -93,7 +92,6 @@ public static void destroy() {
     } else {
       logger.info("Release resources failure.");
     }
-    CommonParameter.setENERGY_LIMIT_HARD_FORK(false);
   }
 
   /**