From f6a572a2bf3f7cbc55399d4e549a239368703055 Mon Sep 17 00:00:00 2001 From: sean-liu55 Date: Wed, 29 May 2019 11:32:48 +0800 Subject: [PATCH] format code --- .../actuator/UnfreezeBalanceActuator.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java b/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java index 2313f6fbea0..b2b9282e822 100755 --- a/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java +++ b/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() + + "]"); } }