Merge pull request #1847 from tronprotocol/hotfix/v3.2.2_energy_limit

Hotfix/v3.2.2 energy limit

Author: renchenchang

src/main/java/org/tron/core/actuator/ProposalCreateActuator.java

@@ -219,6 +219,9 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
         if (!dbManager.getForkController().pass(ForkBlockVersionConsts.ENERGY_LIMIT)) {
           throw new ContractValidateException("Bad chain parameter id");
         }
+        if (dbManager.getForkController().pass(ForkBlockVersionConsts.VERSION_3_2_2)) {
+          throw new ContractValidateException("Bad chain parameter id");
+        }
         if (entry.getValue() < 0 || entry.getValue() > 100_000_000_000_000_000L) {
           throw new ContractValidateException(
               "Bad chain parameter value,valid range is [0,100_000_000_000_000_000L]");

src/test/java/org/tron/core/WalletTest.java

@@ -34,9 +34,9 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.tron.api.GrpcAPI.AssetIssueList;
-import org.tron.api.GrpcAPI.BlockList; 
+import org.tron.api.GrpcAPI.BlockList;
 import org.tron.api.GrpcAPI.ExchangeList;
-import org.tron.api.GrpcAPI.ProposalList; 
+import org.tron.api.GrpcAPI.ProposalList;
 import org.tron.common.application.TronApplicationContext;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.utils.ByteArray;