快照修复 跨区块时重新采集整套数据,最多尝试 3 次。

每次重试重新查询全部数据,不能拼接不同尝试的结果。
记录每次耗时、前后高度及最终失败原因。
全部失败后保留旧快照,等待下一轮。
如果持续跨区块,则检查 RPC 延迟;仅靠重试无法解决长期慢响应。
This commit is contained in:
lu7213 committed 2026-11-02 01:23:42 -05:00
1 parent b84675df3c
commit 41190a25ae
4 files changed
+197 -8

No files matched your search

@@ -755,6 +755,26 @@ public class RentalBusinessTest {
expectFailure(() -> tx.execute(status -> orders.create(app, 10, request)));
}
@Test
public void failedSnapshotCollectionPreservesStoredSnapshotAndVersion() {
Map<String, Object> before = store.get("wallet", wallet, false);
RentalChain unavailable = new RentalChain(json) {
@Override
public Map<String, Object> snapshot(String network, String address) {
throw new IllegalArgumentException("controlled snapshot failure after retries");
}
};
RentalTasks failingTasks = new RentalTasks(store, unavailable, identity, orders, funds,
tx.getTransactionManager());
expectFailure(() -> failingTasks.refresh(wallet));
Map<String, Object> after = store.get("wallet", wallet, false);
assertEquals(before.get("snapshot_at"), after.get("snapshot_at"));
assertEquals(before.get("snapshot_expires_at"), after.get("snapshot_expires_at"));
assertEquals(before.get("snapshot_block_height"), after.get("snapshot_block_height"));
assertEquals(before.get("energy_delegatable_sun"), after.get("energy_delegatable_sun"));
assertEquals(before.get("version"), after.get("version"));
}
@Test
public void onchainDispatchDoesNotRequireStakeSnapshotAndStillVerifiesTransfer() {
store.update("node", node, map("transfer_enabled", 1));
@@ -0,0 +1,131 @@
package com.ruoyi.system.rental;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
import java.util.Map;
import static com.ruoyi.system.rental.RentalValues.*;
import static org.junit.Assert.*;
/** 可控RPC验证整套重采集与有界重试;不访问外网、不广播真实交易。 */
public class RentalSnapshotTest {
@Test
public void changedBlockRetriesWholeSampleAndReturnsOnlyLatestValues() {
FakeChain chain = new FakeChain(1);
Map<String, Object> result = chain.snapshot("NILE", "test-address");
assertEquals(2, chain.resourceCalls);
assertEquals(4, chain.principalCalls);
assertEquals(4, chain.blockCalls);
assertEquals(200, number(result, "energy_available"));
assertEquals(2000, number(result, "energy_delegatable_sun"));
assertEquals(2000, number(result, "bandwidth_delegatable_sun"));
assertEquals(104, number(result, "snapshot_block_height"));
}
@Test
public void thirdAttemptCanSucceedAndSameHeightHashChangesAlsoRetry() {
FakeChain chain = new FakeChain(2);
chain.sameHeightConflict = true;
Map<String, Object> result = chain.snapshot("NILE", "test-address");
assertEquals(3, chain.resourceCalls);
assertEquals(6, chain.principalCalls);
assertEquals(6, chain.blockCalls);
assertEquals(300, number(result, "energy_available"));
assertEquals(106, number(result, "snapshot_block_height"));
}
@Test
public void repeatedBlockChangesStopAfterThreeCompleteAttempts() {
FakeChain chain = new FakeChain(3);
try {
chain.snapshot("NILE", "test-address");
fail("跨区块不能返回不一致快照");
} catch (IllegalArgumentException expected) {
assertEquals(3, chain.resourceCalls);
assertEquals(6, chain.principalCalls);
assertEquals(6, chain.blockCalls);
}
}
@Test
public void stableSnapshotDoesNotMakeExtraRequests() {
FakeChain chain = new FakeChain(0);
assertEquals(102, number(chain.snapshot("NILE", "test-address"), "snapshot_block_height"));
assertEquals(1, chain.resourceCalls);
assertEquals(2, chain.principalCalls);
assertEquals(2, chain.blockCalls);
}
@Test
public void resourceRpcFailureIsNotBlindlyRetried() {
FakeChain chain = new FakeChain(0);
chain.resourceRpcFailed = true;
try {
chain.snapshot("NILE", "test-address");
fail("RPC失败不能生成快照");
} catch (IllegalStateException expected) {
assertEquals(1, chain.resourceCalls);
assertEquals(1, chain.blockCalls);
assertEquals(0, chain.principalCalls);
}
}
@Test
public void incompleteParametersAreNotTreatedAsBlockChanges() {
FakeChain chain = new FakeChain(0);
chain.invalidParameters = true;
try {
chain.snapshot("NILE", "test-address");
fail("全网参数缺失应拒绝");
} catch (IllegalArgumentException expected) {
assertEquals(1, chain.resourceCalls);
assertEquals(2, chain.blockCalls);
}
}
private static final class FakeChain extends RentalChain {
private final ObjectMapper json = new ObjectMapper();
private final int conflictingAttempts;
private int blockCalls;
private int resourceCalls;
private int principalCalls;
private boolean invalidParameters;
private boolean resourceRpcFailed;
private boolean sameHeightConflict;
private FakeChain(int conflictingAttempts) {
super(new ObjectMapper());
this.conflictingAttempts = conflictingAttempts;
}
@Override
public JsonNode call(String network, String path, Map<String, Object> body) {
assertEquals("NILE", network);
if ("/wallet/getnowblock".equals(path)) {
int attempt = blockCalls / 2 + 1;
boolean after = ++blockCalls % 2 == 0;
boolean conflict = after && attempt <= conflictingAttempts;
long height = 100 + attempt * 2 + (conflict && !sameHeightConflict ? 1 : 0);
long blockIdentity = height + (conflict && sameHeightConflict ? 1000 : 0);
return json.valueToTree(map("blockID", String.format("%064x", blockIdentity),
"block_header", map("raw_data", map("number", height))));
}
if ("/wallet/getaccountresource".equals(path)) {
resourceCalls++;
if (resourceRpcFailed) {
throw new IllegalStateException("controlled RPC failure");
}
return json.valueToTree(map("EnergyLimit", resourceCalls * 100,
"TotalEnergyLimit", invalidParameters ? 0 : 60000000,
"TotalEnergyWeight", 1000000, "TotalNetLimit", 1000000, "TotalNetWeight", 1000));
}
if ("/wallet/getcandelegatedmaxsize".equals(path)) {
principalCalls++;
return json.valueToTree(map("max_size", resourceCalls * 1000));
}
throw new AssertionError("意外RPC路径: " + path);
}
}
}