Merge pull request tronprotocol#2264 from tronprotocol/feature/fix_delegated_resource

format code

Author: sean-liu55

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

@@ -275,21 +275,24 @@ public boolean validate() throws ContractValidateException {
             throw new ContractValidateException("no delegatedFrozenBalance(BANDWIDTH)");
           }
 
-          String errorMessage = "AcquiredDelegatedFrozenBalanceForBandwidth[" + receiverCapsule
-              .getAcquiredDelegatedFrozenBalanceForBandwidth() + "] < delegatedBandwidth["
-              + delegatedResourceCapsule.getFrozenBalanceForBandwidth()
-              + "],this should never happen";
-
           if (dbManager.getDynamicPropertiesStore().getAllowTvmConstantinople() == 0) {
             if (receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth()
                 < delegatedResourceCapsule.getFrozenBalanceForBandwidth()) {
-              throw new ContractValidateException(errorMessage);
+              throw new ContractValidateException(
+                  "AcquiredDelegatedFrozenBalanceForBandwidth[" + receiverCapsule
+                      .getAcquiredDelegatedFrozenBalanceForBandwidth() + "] < delegatedBandwidth["
+                      + delegatedResourceCapsule.getFrozenBalanceForBandwidth()
+                      + "]");
             }
           } else {
             if (receiverCapsule != null && receiverCapsule.getType() != AccountType.Contract
                 && receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth()
                 < delegatedResourceCapsule.getFrozenBalanceForBandwidth()) {
-              throw new ContractValidateException(errorMessage);
+              throw new ContractValidateException(
+                  "AcquiredDelegatedFrozenBalanceForBandwidth[" + receiverCapsule
+                      .getAcquiredDelegatedFrozenBalanceForBandwidth() + "] < delegatedBandwidth["
+                      + delegatedResourceCapsule.getFrozenBalanceForBandwidth()
+                      + "]");
             }
           }
 
@@ -301,20 +304,24 @@ public boolean validate() throws ContractValidateException {
           if (delegatedResourceCapsule.getFrozenBalanceForEnergy() <= 0) {
             throw new ContractValidateException("no delegateFrozenBalance(Energy)");
           }
-          errorMessage = "AcquiredDelegatedFrozenBalanceForEnergy[" + receiverCapsule
-              .getAcquiredDelegatedFrozenBalanceForEnergy() + "] < delegatedEnergy["
-              + delegatedResourceCapsule.getFrozenBalanceForEnergy() +
-              "],this should never happen";
           if (dbManager.getDynamicPropertiesStore().getAllowTvmConstantinople() == 0) {
             if (receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy()
                 < delegatedResourceCapsule.getFrozenBalanceForEnergy()) {
-              throw new ContractValidateException(errorMessage);
+              throw new ContractValidateException(
+                  "AcquiredDelegatedFrozenBalanceForEnergy[" + receiverCapsule
+                      .getAcquiredDelegatedFrozenBalanceForEnergy() + "] < delegatedEnergy["
+                      + delegatedResourceCapsule.getFrozenBalanceForEnergy() +
+                      "]");
             }
           } else {
             if (receiverCapsule != null && receiverCapsule.getType() != AccountType.Contract
                 && receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy()
                 < delegatedResourceCapsule.getFrozenBalanceForEnergy()) {
-              throw new ContractValidateException(errorMessage);
+              throw new ContractValidateException(
+                  "AcquiredDelegatedFrozenBalanceForEnergy[" + receiverCapsule
+                      .getAcquiredDelegatedFrozenBalanceForEnergy() + "] < delegatedEnergy["
+                      + delegatedResourceCapsule.getFrozenBalanceForEnergy() +
+                      "]");
             }
           }