Skip to content

refactor(sync): split sync_state into sync_chain and sync_note_transport for granularity #30

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
igamigo merged 13 commits into from
Jun 11, 2026
Merged

refactor(sync): split sync_state into sync_chain and sync_note_transport for granularity #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ddbf39b
refactor(sync): split sync_state into sync_chain and sync_note_transp…
WiktorStarczewski Apr 28, 2026
357d5fa
fix(sync): resolve syncLock.js merge conflict from migration
JereSalo Apr 29, 2026
313c870
test(sync): verify withSyncLock clears in-flight after fn rejects
JereSalo Apr 29, 2026
6223ab8
Merge branch 'next' into wiktor/migrate-2091-syncstate-split
WiktorStarczewski Apr 30, 2026
2b5c02a
Merge remote-tracking branch 'origin/next' into wiktor/migrate-2091-s…
WiktorStarczewski Apr 30, 2026
5162e15
ci: retarget miden-client dep at the syncstate-pre-2100-rebase snapshot
WiktorStarczewski Apr 30, 2026
40d95a6
test: align syncLock + transactions unit tests with the migrated APIs
WiktorStarczewski Apr 30, 2026
a60f9fd
test(sync_lock): replace removed syncStateWithTimeout(N) with syncSta…
WiktorStarczewski Apr 30, 2026
3f805c6
address concurrency findings on the new split sync API
JereSalo May 4, 2026
49a9d80
alias syncChain and syncNoteTransport in Node test adapters
JereSalo May 4, 2026
2e0fc74
drop redundant reference in export.rs format! arg
JereSalo May 4, 2026
df4d263
chore: merge
igamigo Jun 11, 2026
0718930
Merge branch 'next' into wiktor/migrate-2091-syncstate-split
igamigo Jun 11, 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
23 changes: 12 additions & 11 deletions crates/web-client/js/__tests__/resources/transactions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ function makeInner(overrides = {}) {
getConsumableNotes: vi.fn().mockResolvedValue([]),
executeForSummary: vi.fn().mockResolvedValue("summary"),
executeProgram: vi.fn().mockResolvedValue("programResult"),
syncStateWithTimeout: vi.fn().mockResolvedValue(undefined),
syncState: vi.fn().mockResolvedValue(undefined),
syncChain: vi.fn().mockResolvedValue(undefined),
_txResult: txResult,
...overrides,
};
Expand Down Expand Up @@ -157,7 +158,7 @@ describe("TransactionsResource", () => {
waitForConfirmation: true,
timeout: 30000,
});
expect(inner.syncStateWithTimeout).toHaveBeenCalled();
expect(inner.syncChain).toHaveBeenCalled();
expect(result.txId).toBeDefined();
});

Expand Down Expand Up @@ -992,7 +993,7 @@ describe("TransactionsResource", () => {
it("throws timeout when transaction takes too long", async () => {
const { resource } = makeResource({
getTransactions: vi.fn().mockResolvedValue([]),
syncStateWithTimeout: vi.fn().mockResolvedValue(undefined),
syncChain: vi.fn().mockResolvedValue(undefined),
});
await expect(
resource.waitFor("0xtxHex", { timeout: 1, interval: 0 })
Expand Down Expand Up @@ -1034,14 +1035,14 @@ describe("TransactionsResource", () => {
expect(txIdObj.toHex).toHaveBeenCalled();
});

it("continues polling when syncStateWithTimeout throws", async () => {
it("continues polling when syncChain throws", async () => {
const committedStatus = {
isCommitted: () => true,
isDiscarded: () => false,
};
let syncCount = 0;
const { resource } = makeResource({
syncStateWithTimeout: vi.fn().mockImplementation(() => {
syncChain: vi.fn().mockImplementation(() => {
if (syncCount++ === 0) throw new Error("sync fail");
return Promise.resolve();
}),
Expand Down Expand Up @@ -1097,7 +1098,7 @@ describe("TransactionsResource", () => {
waitForConfirmation: true,
timeout: 5000,
});
expect(inner.syncStateWithTimeout).toHaveBeenCalled();
expect(inner.syncChain).toHaveBeenCalled();
expect(result.note).toBe("p2idNote");
});
});
Expand All @@ -1120,7 +1121,7 @@ describe("TransactionsResource", () => {
waitForConfirmation: true,
timeout: 5000,
});
expect(inner.syncStateWithTimeout).toHaveBeenCalled();
expect(inner.syncChain).toHaveBeenCalled();
expect(result.txId).toBeDefined();
});
});
Expand All @@ -1141,7 +1142,7 @@ describe("TransactionsResource", () => {
waitForConfirmation: true,
timeout: 5000,
});
expect(inner.syncStateWithTimeout).toHaveBeenCalled();
expect(inner.syncChain).toHaveBeenCalled();
expect(result.txId).toBeDefined();
});
});
Expand All @@ -1167,7 +1168,7 @@ describe("TransactionsResource", () => {
waitForConfirmation: true,
timeout: 5000,
});
expect(inner.syncStateWithTimeout).toHaveBeenCalled();
expect(inner.syncChain).toHaveBeenCalled();
expect(result.consumed).toBe(1);
});
});
Expand All @@ -1190,7 +1191,7 @@ describe("TransactionsResource", () => {
waitForConfirmation: true,
timeout: 5000,
});
expect(inner.syncStateWithTimeout).toHaveBeenCalled();
expect(inner.syncChain).toHaveBeenCalled();
});
});

Expand All @@ -1210,7 +1211,7 @@ describe("TransactionsResource", () => {
waitForConfirmation: true,
timeout: 5000,
});
expect(inner.syncStateWithTimeout).toHaveBeenCalled();
expect(inner.syncChain).toHaveBeenCalled();
expect(result.txId).toBeDefined();
});
});
Expand Down
Loading
Loading