feat: remove no-LMDB fallback from cosmic-swingset

Agoric · May 29, 2021 · 11dba7a · 11dba7a
1 parent 7a3935b
commit 11dba7a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 71 deletions.
diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json
@@ -33,7 +33,6 @@
     "@agoric/install-metering-and-ses": "^0.2.13",
     "@agoric/store": "^0.4.14",
     "@agoric/swing-store-lmdb": "^0.4.12",
-    "@agoric/swing-store-simple": "^0.3.9",
     "@agoric/swingset-vat": "^0.17.2",
     "@agoric/vats": "^0.2.2",
     "@iarna/toml": "^2.2.3",

diff --git a/packages/cosmic-swingset/src/check-lmdb.js b/packages/cosmic-swingset/src/check-lmdb.js
diff --git a/packages/cosmic-swingset/src/launch-chain.js b/packages/cosmic-swingset/src/launch-chain.js
@@ -1,4 +1,3 @@
-import path from 'path';
 import anylogger from 'anylogger';
 
 import {
@@ -13,7 +12,7 @@ import {
   loadSwingsetConfigFile,
 } from '@agoric/swingset-vat';
 import { assert, details as X } from '@agoric/assert';
-import { getBestSwingStore } from './check-lmdb';
+import { openSwingStore } from '@agoric/swing-store-lmdb';
 import {
   DEFAULT_METER_PROVIDER,
   exportKernelStats,
@@ -98,8 +97,6 @@ export async function launch(
 ) {
   console.info('Launching SwingSet kernel');
 
-  const tempdir = path.resolve(kernelStateDBDir, 'check-lmdb-tempdir');
-  const { openSwingStore } = getBestSwingStore(tempdir);
   const { kvStore, streamStore, commit } = openSwingStore(kernelStateDBDir);
   const hostStorage = {
     kvStore,

diff --git a/packages/solo/src/reset-state.js b/packages/solo/src/reset-state.js
@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 
-import { getBestSwingStore } from '@agoric/cosmic-swingset/src/check-lmdb';
+import { initSwingStore } from '@agoric/swing-store-lmdb';
 
 export default async function resetState(basedir) {
   const mailboxStateFile = path.resolve(
@@ -10,8 +10,6 @@ export default async function resetState(basedir) {
   );
   fs.writeFileSync(mailboxStateFile, `{}\n`);
   const kernelStateDBDir = path.join(basedir, 'swingset-kernel-state');
-  const tempdir = path.resolve(basedir, 'check-lmdb-tempdir');
-  const { initSwingStore } = getBestSwingStore(tempdir);
   const { commit, close } = initSwingStore(kernelStateDBDir);
   commit();
   close();

diff --git a/packages/solo/src/start.js b/packages/solo/src/start.js
@@ -23,7 +23,7 @@ import {
   buildPlugin,
   buildTimer,
 } from '@agoric/swingset-vat';
-import { getBestSwingStore } from '@agoric/cosmic-swingset/src/check-lmdb';
+import { openSwingStore } from '@agoric/swing-store-lmdb';
 import { connectToFakeChain } from '@agoric/cosmic-swingset/src/sim-chain';
 import { makeWithQueue } from '@agoric/vats/src/queue';
 
@@ -134,8 +134,6 @@ async function buildSwingset(
     plugin: { ...plugin.endowments },
   };
 
-  const tempdir = path.resolve(kernelStateDBDir, 'check-lmdb-tempdir');
-  const { openSwingStore } = getBestSwingStore(tempdir);
   const { kvStore, streamStore, commit } = openSwingStore(kernelStateDBDir);
   const hostStorage = {
     kvStore,