Skip to content

Commit 9cda6a4

Browse files
FUDCoFUDCo
committed
feat: modify all SwingStore uses to reflect constructor renaming
1 parent 1c986ba commit 9cda6a4

File tree

12 files changed

+32
-32
lines changed

12 files changed

+32
-32
lines changed

‎packages/SwingSet/src/hostStorage.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// @ts-check
2-
import { initSwingStore as initSimpleSwingStore } from '@agoric/swing-store-simple';
2+
import { initSimpleSwingStore } from '@agoric/swing-store-simple';
33
import {
4-
initSwingStore as initLMDBSwingStore,
5-
openSwingStore as openLMDBSwingStore,
4+
initLMDBSwingStore,
5+
openLMDBSwingStore,
66
} from '@agoric/swing-store-lmdb';
77

88
import { assert, details as X } from '@agoric/assert';

‎packages/SwingSet/test/test-clist.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { test } from '../tools/prepare-test-env-ava';
22

33
// eslint-disable-next-line import/order
4-
import { initSwingStore } from '@agoric/swing-store-simple';
4+
import { initSimpleSwingStore } from '@agoric/swing-store-simple';
55
import { makeDummySlogger } from '../src/kernel/slogger';
66
import makeKernelKeeper from '../src/kernel/state/kernelKeeper';
77
import { wrapStorage } from '../src/kernel/state/storageWrapper';
88

99
test(`clist reachability`, async t => {
1010
const slog = makeDummySlogger({});
11-
const hostStorage = initSwingStore();
11+
const hostStorage = initSimpleSwingStore();
1212
const { enhancedCrankBuffer: s } = wrapStorage(hostStorage.kvStore);
1313

1414
const kk = makeKernelKeeper(s, hostStorage.streamStore, slog);

‎packages/SwingSet/test/test-state.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { test } from '../tools/prepare-test-env-ava';
22

33
// eslint-disable-next-line import/order
44
import {
5-
initSwingStore,
5+
initSimpleSwingStore,
66
getAllState,
77
setAllState,
88
} from '@agoric/swing-store-simple';
@@ -68,12 +68,12 @@ function testStorage(t, s, getState, commit) {
6868
}
6969

7070
test('storageInMemory', t => {
71-
const store = initSwingStore();
71+
const store = initSimpleSwingStore();
7272
testStorage(t, store.kvStore, () => getAllState(store).kvStuff, null);
7373
});
7474

7575
function buildHostDBAndGetState() {
76-
const store = initSwingStore();
76+
const store = initSimpleSwingStore();
7777
const hostDB = buildHostDBInMemory(store.kvStore);
7878
return { hostDB, getState: () => getAllState(store).kvStuff };
7979
}
@@ -119,13 +119,13 @@ test('blockBuffer fulfills storage API', t => {
119119
});
120120

121121
test('guardStorage fulfills storage API', t => {
122-
const store = initSwingStore();
122+
const store = initSimpleSwingStore();
123123
const guardedHostStorage = guardStorage(store.kvStore);
124124
testStorage(t, guardedHostStorage, () => getAllState(store).kvStuff, null);
125125
});
126126

127127
test('crankBuffer fulfills storage API', t => {
128-
const store = initSwingStore();
128+
const store = initSimpleSwingStore();
129129
const { crankBuffer, commitCrank } = buildCrankBuffer(store.kvStore);
130130
testStorage(t, crankBuffer, () => getAllState(store).kvStuff, commitCrank);
131131
});
@@ -186,7 +186,7 @@ test('crankBuffer can abortCrank', t => {
186186
});
187187

188188
test('storage helpers', t => {
189-
const store = initSwingStore();
189+
const store = initSimpleSwingStore();
190190
const s = addHelpers(store.kvStore);
191191

192192
s.set('foo.0', 'f0');
@@ -236,7 +236,7 @@ test('storage helpers', t => {
236236
});
237237

238238
function buildKeeperStorageInMemory() {
239-
const store = initSwingStore();
239+
const store = initSimpleSwingStore();
240240
const { kvStore, streamStore } = store;
241241
const { enhancedCrankBuffer, commitCrank } = wrapStorage(kvStore);
242242
return {
@@ -248,7 +248,7 @@ function buildKeeperStorageInMemory() {
248248
}
249249

250250
function duplicateKeeper(getState) {
251-
const store = initSwingStore();
251+
const store = initSimpleSwingStore();
252252
const { kvStore, streamStore } = store;
253253
setAllState(store, { kvStuff: getState(), streamStuff: new Map() });
254254
const { enhancedCrankBuffer } = wrapStorage(kvStore);

‎packages/SwingSet/tools/db-delete.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import '@agoric/install-ses';
44
import process from 'process';
5-
import { openSwingStore } from '@agoric/swing-store-lmdb';
5+
import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
66

77
const log = console.log;
88

@@ -47,7 +47,7 @@ function run() {
4747
const stateDBDir = argv.shift();
4848
const key = argv.shift();
4949

50-
const { kvStore, commit } = openSwingStore(stateDBDir);
50+
const { kvStore, commit } = openLMDBSwingStore(stateDBDir);
5151

5252
if (range) {
5353
for (const k of kvStore.getKeys(`${key}.`, `${key}/`)) {

‎packages/SwingSet/tools/db-get.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import '@agoric/install-ses';
44
import process from 'process';
5-
import { openSwingStore } from '@agoric/swing-store-lmdb';
5+
import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
66

77
const log = console.log;
88

@@ -58,7 +58,7 @@ function run() {
5858
const stateDBDir = argv.shift();
5959
const key = argv.shift();
6060

61-
const { kvStore } = openSwingStore(stateDBDir);
61+
const { kvStore } = openLMDBSwingStore(stateDBDir);
6262

6363
function pkv(k) {
6464
const value = kvStore.get(k);

‎packages/SwingSet/tools/db-set.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import '@agoric/install-ses';
44
import process from 'process';
5-
import { openSwingStore } from '@agoric/swing-store-lmdb';
5+
import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
66

77
const log = console.log;
88

@@ -33,7 +33,7 @@ function run() {
3333
const key = argv.shift();
3434
const value = argv.shift();
3535

36-
const { kvStore, commit } = openSwingStore(stateDBDir);
36+
const { kvStore, commit } = openLMDBSwingStore(stateDBDir);
3737

3838
kvStore.set(key, value);
3939
commit();

‎packages/SwingSet/tools/replace-bundle.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import '@agoric/install-ses';
44
import process from 'process';
5-
import { openSwingStore } from '@agoric/swing-store-lmdb';
5+
import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
66
import bundleSource from '@agoric/bundle-source';
77

88
const log = console.log;
@@ -35,7 +35,7 @@ async function run() {
3535
const stateDBDir = argv.shift();
3636
const srcPath = argv.shift();
3737

38-
const { kvStore, commit } = openSwingStore(stateDBDir);
38+
const { kvStore, commit } = openLMDBSwingStore(stateDBDir);
3939
log(`will use ${srcPath} in ${stateDBDir} for ${bundleName}`);
4040

4141
if (bundleName === 'kernel') {

‎packages/cosmic-swingset/src/launch-chain.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
loadSwingsetConfigFile,
1313
} from '@agoric/swingset-vat';
1414
import { assert, details as X } from '@agoric/assert';
15-
import { openSwingStore } from '@agoric/swing-store-lmdb';
15+
import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
1616
import {
1717
DEFAULT_METER_PROVIDER,
1818
exportKernelStats,
@@ -97,7 +97,7 @@ export async function launch(
9797
) {
9898
console.info('Launching SwingSet kernel');
9999

100-
const { kvStore, streamStore, commit } = openSwingStore(kernelStateDBDir);
100+
const { kvStore, streamStore, commit } = openLMDBSwingStore(kernelStateDBDir);
101101
const hostStorage = {
102102
kvStore,
103103
streamStore,

‎packages/solo/src/reset-state.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path from 'path';
22
import fs from 'fs';
33

4-
import { initSwingStore } from '@agoric/swing-store-lmdb';
4+
import { initLMDBSwingStore } from '@agoric/swing-store-lmdb';
55

66
export default async function resetState(basedir) {
77
const mailboxStateFile = path.resolve(
@@ -10,7 +10,7 @@ export default async function resetState(basedir) {
1010
);
1111
fs.writeFileSync(mailboxStateFile, `{}\n`);
1212
const kernelStateDBDir = path.join(basedir, 'swingset-kernel-state');
13-
const { commit, close } = initSwingStore(kernelStateDBDir);
13+
const { commit, close } = initLMDBSwingStore(kernelStateDBDir);
1414
commit();
1515
close();
1616
}

‎packages/solo/src/start.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
buildPlugin,
2424
buildTimer,
2525
} from '@agoric/swingset-vat';
26-
import { openSwingStore } from '@agoric/swing-store-lmdb';
26+
import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
2727
import { connectToFakeChain } from '@agoric/cosmic-swingset/src/sim-chain';
2828
import { makeWithQueue } from '@agoric/vats/src/queue';
2929

@@ -134,7 +134,7 @@ async function buildSwingset(
134134
plugin: { ...plugin.endowments },
135135
};
136136

137-
const { kvStore, streamStore, commit } = openSwingStore(kernelStateDBDir);
137+
const { kvStore, streamStore, commit } = openLMDBSwingStore(kernelStateDBDir);
138138
const hostStorage = {
139139
kvStore,
140140
streamStore,

‎packages/swingset-runner/src/kerneldump.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fs from 'fs';
22
import path from 'path';
33
import process from 'process';
44

5-
import { openSwingStore } from '@agoric/swing-store-lmdb';
5+
import { openLMDBSwingStore } from '@agoric/swing-store-lmdb';
66

77
import { dumpStore } from './dumpstore';
88
import { auditRefCounts } from './auditstore';
@@ -106,7 +106,7 @@ export function main() {
106106
if (!kernelStateDBDir) {
107107
fail(`can't find a database at ${target}`, false);
108108
}
109-
const swingStore = openSwingStore(kernelStateDBDir);
109+
const swingStore = openLMDBSwingStore(kernelStateDBDir);
110110
if (justStats) {
111111
const rawStats = JSON.parse(swingStore.kvStore.get('kernelStats'));
112112
const cranks = Number(swingStore.kvStore.get('crankNumber'));

‎packages/swingset-runner/src/main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import {
1515
import { buildLoopbox } from '@agoric/swingset-vat/src/devices/loopbox';
1616
import engineGC from '@agoric/swingset-vat/src/engine-gc';
1717

18-
import { initSwingStore as initSimpleSwingStore } from '@agoric/swing-store-simple';
18+
import { initSimpleSwingStore } from '@agoric/swing-store-simple';
1919
import {
20-
initSwingStore as initLMDBSwingStore,
21-
openSwingStore as openLMDBSwingStore,
20+
initLMDBSwingStore,
21+
openLMDBSwingStore,
2222
} from '@agoric/swing-store-lmdb';
2323

2424
import { dumpStore } from './dumpstore';

0 commit comments

Comments
 (0)