Skip to content

Move finalization to test #1436

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 2 commits into from
Sep 4, 2018
Merged

Move finalization to test #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bea488
move finalization to test
tjchern Sep 4, 2018
de34170
Merge remote-tracking branch 'origin/develop' into test_about_energy
tjchern Sep 4, 2018
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 src/main/java/org/tron/core/db/TransactionTrace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void exec(Runtime runtime)
/** VM execute **/
runtime.execute();
runtime.go();
runtime.finalization();

}

public void finalization(Runtime runtime) throws ContractExeException {
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/org/tron/common/runtime/TVMTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ public static Runtime processTransactionAndReturnRuntime(Transaction trx,
//exec
trace.exec(runtime);

runtime.finalization();

return runtime;
}

Expand Down Expand Up @@ -139,6 +141,8 @@ public static TVMTestResult processTransactionAndReturnTVMTestResult(Transaction
//exec
trace.exec(runtime);

runtime.finalization();

return new TVMTestResult(runtime, trace.getReceipt(), null);
}

Expand Down