Skip to content

Fix style #4191

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 1 commit into from
Dec 15, 2021
Merged

Fix style #4191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion actuator/src/main/java/org/tron/core/actuator/VMActuator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public void execute(Object object) throws ContractExeException {
result.setException(Program.Exception.invalidCodeException());
}
}
long saveCodeEnergy = (long) getLength(code) * EnergyCost.getCREATE_DATA();
long saveCodeEnergy = (long) getLength(code) * EnergyCost.getCreateData();
long afterSpend = program.getEnergyLimitLeft().longValue() - saveCodeEnergy;
if (afterSpend < 0) {
if (null == result.getException()) {
Expand Down
2 changes: 1 addition & 1 deletion actuator/src/main/java/org/tron/core/vm/EnergyCost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public static long getNewAcctCall() {
return NEW_ACCT_CALL;
}

public static long getCREATE_DATA() {
public static long getCreateData() {
return CREATE_DATA;
}

Expand Down
16 changes: 8 additions & 8 deletions actuator/src/main/java/org/tron/core/vm/OperationActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ public static void codeCopyAction(Program program) {
int codeOffset = program.stackPop().intValueSafe();
int lengthData = program.stackPop().intValueSafe();

int sizeToBeCopied =
(long) codeOffset + lengthData > fullCode.length
? (fullCode.length < codeOffset ? 0 : fullCode.length - codeOffset)
: lengthData;
int sizeToBeCopied = lengthData;
if ((long) codeOffset + lengthData > fullCode.length) {
sizeToBeCopied = fullCode.length < codeOffset ? 0 : fullCode.length - codeOffset;
}

byte[] codeCopy = new byte[lengthData];

Expand Down Expand Up @@ -457,10 +457,10 @@ public static void extCodeCopyAction(Program program) {
int codeOffset = program.stackPop().intValueSafe();
int lengthData = program.stackPop().intValueSafe();

int sizeToBeCopied =
(long) codeOffset + lengthData > fullCode.length
? (fullCode.length < codeOffset ? 0 : fullCode.length - codeOffset)
: lengthData;
int sizeToBeCopied = lengthData;
if ((long) codeOffset + lengthData > fullCode.length) {
sizeToBeCopied = fullCode.length < codeOffset ? 0 : fullCode.length - codeOffset;
}

byte[] codeCopy = new byte[lengthData];

Expand Down
2 changes: 1 addition & 1 deletion actuator/src/main/java/org/tron/core/vm/program/Program.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ this, new DataWord(newAddress), getContractAddress(), value, DataWord.ZERO(),
.invalidCodeException());
}

long saveCodeEnergy = (long) getLength(code) * EnergyCost.getCREATE_DATA();
long saveCodeEnergy = (long) getLength(code) * EnergyCost.getCreateData();

long afterSpend =
programInvoke.getEnergyLimit() - createResult.getEnergyUsed() - saveCodeEnergy;
Expand Down