Skip to content

Commit 1da0189

Browse files
committed
refactor: remove same code
1 parent cad834b commit 1da0189

File tree

2 files changed

+1
-56
lines changed

2 files changed

+1
-56
lines changed

src/main/java/org/tron/core/capsule/TransactionCapsule.java

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -885,61 +885,6 @@ public String toString() {
885885
return toStringBuff.toString();
886886
}
887887

888-
public void setResult(Runtime runtime) {
889-
RuntimeException exception = runtime.getResult().getException();
890-
if (Objects.isNull(exception) && StringUtils
891-
.isEmpty(runtime.getRuntimeError()) && !runtime.getResult().isRevert()) {
892-
this.setResultCode(contractResult.SUCCESS);
893-
return;
894-
}
895-
if (runtime.getResult().isRevert()) {
896-
this.setResultCode(contractResult.REVERT);
897-
return;
898-
}
899-
if (exception instanceof IllegalOperationException) {
900-
this.setResultCode(contractResult.ILLEGAL_OPERATION);
901-
return;
902-
}
903-
if (exception instanceof OutOfEnergyException) {
904-
this.setResultCode(contractResult.OUT_OF_ENERGY);
905-
return;
906-
}
907-
if (exception instanceof BadJumpDestinationException) {
908-
this.setResultCode(contractResult.BAD_JUMP_DESTINATION);
909-
return;
910-
}
911-
if (exception instanceof OutOfTimeException) {
912-
this.setResultCode(contractResult.OUT_OF_TIME);
913-
return;
914-
}
915-
if (exception instanceof OutOfMemoryException) {
916-
this.setResultCode(contractResult.OUT_OF_MEMORY);
917-
return;
918-
}
919-
if (exception instanceof PrecompiledContractException) {
920-
this.setResultCode(contractResult.PRECOMPILED_CONTRACT);
921-
return;
922-
}
923-
if (exception instanceof StackTooSmallException) {
924-
this.setResultCode(contractResult.STACK_TOO_SMALL);
925-
return;
926-
}
927-
if (exception instanceof StackTooLargeException) {
928-
this.setResultCode(contractResult.STACK_TOO_LARGE);
929-
return;
930-
}
931-
if (exception instanceof JVMStackOverFlowException) {
932-
this.setResultCode(contractResult.JVM_STACK_OVER_FLOW);
933-
return;
934-
}
935-
if (exception instanceof Program.TransferException) {
936-
this.setResultCode(contractResult.TRANSFER_FAILED);
937-
return;
938-
}
939-
this.setResultCode(contractResult.UNKNOWN);
940-
return;
941-
}
942-
943888
public void setResultCode(contractResult code) {
944889
Result ret = Result.newBuilder().setContractRet(code).build();
945890
if (this.transaction.getRetCount() > 0) {

src/main/java/org/tron/core/db/Manager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ public boolean processTransaction(TransactionCapsule trxCap, BlockCapsule blockC
13621362

13631363
trace.finalization();
13641364
if (Objects.nonNull(blockCap) && getDynamicPropertiesStore().supportVM()) {
1365-
trxCap.setResult(trace.getRuntime());
1365+
trxCap.setResultCode(trace.getReceipt().getResult());
13661366
}
13671367
transactionStore.put(trxCap.getTransactionId().getBytes(), trxCap);
13681368

0 commit comments

Comments
 (0)