Skip to content

Commit 7c40768

Browse files
committed
fix: remove crankNumber from transcript entries
The VatManager is responsible for maintaining a transcript of all deliveries to their vat worker, so the vat can be reloaded later. These transcript entries have been including the `crankNumber`: a global counter indicating how many cranks have been delivered (to all vats, not just the one for which the transcript entry is being created). This removes that crankNumber from the transcript: * each vat should be independent, this global crankNumber is revealing information about what happens in other vats * #2400 is changing the type of `crankNumber` to a BigInt, which cannot be serialized by the simple `JSON.stringify` used in vatKeeper.js It also removes the now-unnecessary `kernelKeeper` argument from `makeTranscriptManager`, and changes one test that happened to depend upon the presence of the crankNumber field. closes #2428
1 parent 4b2fe4f commit 7c40768

File tree

6 files changed

+5
-23
lines changed

6 files changed

+5
-23
lines changed

packages/SwingSet/src/kernel/vatManager/manager-local.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ export function makeLocalVatManagerFactory(tools) {
3232

3333
function prepare(vatID) {
3434
const vatKeeper = kernelKeeper.getVatKeeper(vatID);
35-
const transcriptManager = makeTranscriptManager(
36-
kernelKeeper,
37-
vatKeeper,
38-
vatID,
39-
);
35+
const transcriptManager = makeTranscriptManager(vatKeeper, vatID);
4036
const { syscall, setVatSyscallHandler } = createSyscall(transcriptManager);
4137
function finish(dispatch, meterRecord) {
4238
assert(

packages/SwingSet/src/kernel/vatManager/manager-nodeworker.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ export function makeNodeWorkerVatManagerFactory(tools) {
3838
);
3939
}
4040
const vatKeeper = kernelKeeper.getVatKeeper(vatID);
41-
const transcriptManager = makeTranscriptManager(
42-
kernelKeeper,
43-
vatKeeper,
44-
vatID,
45-
);
41+
const transcriptManager = makeTranscriptManager(vatKeeper, vatID);
4642

4743
// prepare to accept syscalls from the worker
4844

packages/SwingSet/src/kernel/vatManager/manager-subprocess-node.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ export function makeNodeSubprocessFactory(tools) {
3939
);
4040
}
4141
const vatKeeper = kernelKeeper.getVatKeeper(vatID);
42-
const transcriptManager = makeTranscriptManager(
43-
kernelKeeper,
44-
vatKeeper,
45-
vatID,
46-
);
42+
const transcriptManager = makeTranscriptManager(vatKeeper, vatID);
4743

4844
// prepare to accept syscalls from the worker
4945

packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ export function makeXsSubprocessFactory({
5757
console.log(`xsnap worker does not support enableInternalMetering`);
5858
}
5959
const vatKeeper = kernelKeeper.getVatKeeper(vatID);
60-
const transcriptManager = makeTranscriptManager(
61-
kernelKeeper,
62-
vatKeeper,
63-
vatID,
64-
);
60+
const transcriptManager = makeTranscriptManager(vatKeeper, vatID);
6561

6662
const { doSyscall, setVatSyscallHandler } = createSyscall(
6763
transcriptManager,

packages/SwingSet/src/kernel/vatManager/transcript.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import djson from '../djson';
22

3-
export function makeTranscriptManager(kernelKeeper, vatKeeper, vatID) {
3+
export function makeTranscriptManager(vatKeeper, vatID) {
44
let weAreInReplay = false;
55
let playbackSyscalls;
66
let currentEntry;
@@ -9,7 +9,6 @@ export function makeTranscriptManager(kernelKeeper, vatKeeper, vatID) {
99
currentEntry = {
1010
d,
1111
syscalls: [],
12-
crankNumber: kernelKeeper.getCrankNumber(),
1312
};
1413
}
1514

packages/SwingSet/test/test-kernel.js

-1
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,6 @@ test('transcript', async t => {
989989
response: null,
990990
},
991991
],
992-
crankNumber: 1,
993992
});
994993
});
995994

0 commit comments

Comments
 (0)