Skip to content

code style #2258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 28, 2019
Merged

code style #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ca22a1
code style
sean-liu55 May 28, 2019
23efa4f
fix conflict in test
sean-liu55 May 28, 2019
f52e251
format code
sean-liu55 May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 44 additions & 32 deletions src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
}

AccountCapsule receiverCapsule = dbManager.getAccountStore().get(receiverAddress);
if (receiverAddressIsValid(receiverCapsule)) {
if (dbManager.getDynamicPropertiesStore().getAllowTvmConstantinople() == 0 ||
(receiverCapsule != null && receiverCapsule.getType() != AccountType.Contract)) {
switch (unfreezeBalanceContract.getResource()) {
case BANDWIDTH:
receiverCapsule.addAcquiredDelegatedFrozenBalanceForBandwidth(-unfreezeBalance);
Expand Down Expand Up @@ -205,10 +206,6 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
return true;
}

private boolean receiverAddressIsValid(AccountCapsule receiverCapsule) {
return receiverCapsule != null && receiverCapsule.getType() != AccountType.Contract;
}

@Override
public boolean validate() throws ContractValidateException {
if (this.contract == null) {
Expand Down Expand Up @@ -255,16 +252,11 @@ public boolean validate() throws ContractValidateException {
}

AccountCapsule receiverCapsule = dbManager.getAccountStore().get(receiverAddress);
if (receiverCapsule == null) {
if (dbManager.getDynamicPropertiesStore().getAllowTvmConstantinople() == 0
&& receiverCapsule == null) {
String readableReceiverAddress = StringUtil.createReadableString(receiverAddress);
if (dbManager.getDynamicPropertiesStore().getAllowTvmConstantinople() != 1) {
throw new ContractValidateException(
"Account[" + readableReceiverAddress + "] not exists");
} else {
logger.warn(
"Account[" + readableReceiverAddress + "] not exists,may be deleted");
}

throw new ContractValidateException(
"Receiver Account[" + readableReceiverAddress + "] not exists");
}

byte[] key = DelegatedResourceCapsule
Expand All @@ -282,16 +274,26 @@ public boolean validate() throws ContractValidateException {
if (delegatedResourceCapsule.getFrozenBalanceForBandwidth() <= 0) {
throw new ContractValidateException("no delegatedFrozenBalance(BANDWIDTH)");
}
if (receiverAddressIsValid(receiverCapsule)
&& receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth()
< delegatedResourceCapsule.getFrozenBalanceForBandwidth()) {

throw new ContractValidateException(
"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");
}
} 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");
}
}

if (delegatedResourceCapsule.getExpireTimeForBandwidth() > now) {
Expand All @@ -302,15 +304,25 @@ public boolean validate() throws ContractValidateException {
if (delegatedResourceCapsule.getFrozenBalanceForEnergy() <= 0) {
throw new ContractValidateException("no delegateFrozenBalance(Energy)");
}
if (receiverAddressIsValid(receiverCapsule)
&& receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy()
< delegatedResourceCapsule.getFrozenBalanceForEnergy()) {
throw new ContractValidateException(
"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");
}
} 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");
}
}

if (delegatedResourceCapsule.getExpireTimeForEnergy(dbManager) > now) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public void testUnfreezeDelegatedBalanceForBandwidthWithDeletedReceiver() {
actuator.validate();
actuator.execute(ret);
} catch (ContractValidateException e) {
Assert.assertEquals(e.getMessage(),"Account[a0abd4b9367799eaa3197fecb144eb71de1e049150] not exists");
Assert.assertEquals(e.getMessage(),"Receiver Account[a0abd4b9367799eaa3197fecb144eb71de1e049150] not exists");
} catch (ContractExeException e) {
Assert.assertFalse(e instanceof ContractExeException);
}
Expand Down Expand Up @@ -583,7 +583,7 @@ public void testUnfreezeDelegatedBalanceForCpuWithDeletedReceiver() {
actuator.validate();
actuator.execute(ret);
} catch (ContractValidateException e) {
Assert.assertEquals(e.getMessage(),"Account[a0abd4b9367799eaa3197fecb144eb71de1e049150] not exists");
Assert.assertEquals(e.getMessage(),"Receiver Account[a0abd4b9367799eaa3197fecb144eb71de1e049150] not exists");
} catch (ContractExeException e) {
Assert.assertFalse(e instanceof ContractExeException);
}
Expand Down