From 479bb3237100c82f70d884ac0e34d7dd3c736284 Mon Sep 17 00:00:00 2001 From: sean-liu55 Date: Wed, 29 May 2019 11:04:36 +0800 Subject: [PATCH] format code --- .../actuator/UnfreezeBalanceActuator.java | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java b/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java index 1be62db319d..2313f6fbea0 100755 --- a/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java +++ b/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java @@ -275,24 +275,21 @@ 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( - "AcquiredDelegatedFrozenBalanceForBandwidth[" + receiverCapsule - .getAcquiredDelegatedFrozenBalanceForBandwidth() + "] < delegatedBandwidth[" - + delegatedResourceCapsule.getFrozenBalanceForBandwidth() - + "],this should never happen"); + throw new ContractValidateException(errorMessage); } } else { if (receiverCapsule != null && receiverCapsule.getType() != AccountType.Contract && receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth() < delegatedResourceCapsule.getFrozenBalanceForBandwidth()) { - throw new ContractValidateException( - "AcquiredDelegatedFrozenBalanceForBandwidth[" + receiverCapsule - .getAcquiredDelegatedFrozenBalanceForBandwidth() + "] < delegatedBandwidth[" - + delegatedResourceCapsule.getFrozenBalanceForBandwidth() - + "],this should never happen"); + throw new ContractValidateException(errorMessage); } } @@ -304,24 +301,20 @@ 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( - "AcquiredDelegatedFrozenBalanceForEnergy[" + receiverCapsule - .getAcquiredDelegatedFrozenBalanceForEnergy() + "] < delegatedEnergy[" - + delegatedResourceCapsule.getFrozenBalanceForEnergy() + - "],this should never happen"); + throw new ContractValidateException(errorMessage); } } else { if (receiverCapsule != null && receiverCapsule.getType() != AccountType.Contract && receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy() < delegatedResourceCapsule.getFrozenBalanceForEnergy()) { - throw new ContractValidateException( - "AcquiredDelegatedFrozenBalanceForEnergy[" + receiverCapsule - .getAcquiredDelegatedFrozenBalanceForEnergy() + "] < delegatedEnergy[" - + delegatedResourceCapsule.getFrozenBalanceForEnergy() + - "],this should never happen"); + throw new ContractValidateException(errorMessage); } }