From 7703aa753769d89dc1b2c7a899cfcf37c2f3626f Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Sun, 1 Mar 2020 12:31:08 -0600 Subject: [PATCH] fix(chain): properly commit state --- packages/cosmic-swingset/lib/launch-chain.js | 25 ++++++-------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/packages/cosmic-swingset/lib/launch-chain.js b/packages/cosmic-swingset/lib/launch-chain.js index 6920081e3c3..fbe5cf1a7d1 100644 --- a/packages/cosmic-swingset/lib/launch-chain.js +++ b/packages/cosmic-swingset/lib/launch-chain.js @@ -108,41 +108,30 @@ export async function launch(kernelStateDBDir, mailboxStorage, vatsDir, argv) { saveState(); // then arrange for inbound messages to be processed, after which we save - async function turnCrank(committed) { + async function turnCrank() { const start = Date.now(); await controller.run(); const runTime = Date.now() - start; - if (committed) { - saveState(runTime); - } else { - console.log(`proposed SwingSet transaction [run=${runTime}ms]`); - } + // Have to save state every time. + saveState(runTime); } - async function deliverInbound(sender, messages, ack, committed) { + async function deliverInbound(sender, messages, ack, _committed) { if (!(messages instanceof Array)) { throw new Error(`inbound given non-Array: ${messages}`); } if (mb.deliverInbound(sender, messages, ack)) { console.log(`mboxDeliver: ADDED messages`); - await turnCrank(committed); - } else if (committed) { - // We need to save our state on every commitment. - saveState(); } + await turnCrank(); } - async function deliverStartBlock(blockHeight, blockTime, committed) { + async function deliverStartBlock(blockHeight, blockTime, _committed) { const addedToQueue = timer.poll(blockTime); console.log( `polled; blockTime:${blockTime}, h:${blockHeight} ADDED: ${addedToQueue}`, ); - if (addedToQueue) { - await turnCrank(committed); - } else if (committed) { - // We need to save our state on every commitment. - saveState(); - } + await turnCrank(); } return { deliverInbound, deliverStartBlock };