Skip to content

test(framework): await reward calculation before mutating store #7025

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
kuny0707 merged 3 commits into from
Oct 13, 2026
+12 −2
Merged

test(framework): await reward calculation before mutating store #7025

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccba12a
test(framework): await reward calculation before mutating store
317787106 Oct 13, 2026
f312a2b
use shutdownNow to replace shutdown in ComputeRewardTest.query
317787106 Oct 13, 2026
800b853
optimize ComputeRewardTest
317787106 Oct 13, 2026
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
14 changes: 12 additions & 2 deletions framework/src/test/java/org/tron/core/services/ComputeRewardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -248,8 +250,16 @@ private void setUp() {
}

@Test
public void query() {
Assert.assertEquals(3189, mortgageService.queryReward(OWNER_ADDRESS));
public void query() throws InterruptedException {
long reward = mortgageService.queryReward(OWNER_ADDRESS);
// queryReward() can return before the background Merkle-root calculation finishes.
// Wait before asserting or mutating the store; a failed assertion triggers teardown.
ExecutorService rewardExecutor = ReflectUtils.getFieldValue(rewardViCalService, "es");
rewardExecutor.shutdownNow();
Assert.assertTrue("Reward calculation did not terminate before modifying its store",
rewardExecutor.awaitTermination(10, TimeUnit.SECONDS));
Comment thread
3for marked this conversation as resolved.
Assert.assertEquals(3189L, reward);

// mock root is error
rewardViStore.put("test".getBytes(), "test".getBytes());
ReflectUtils.invokeMethod(rewardViCalService,"maybeRun");
Expand Down
Loading