Skip to content
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

chore: snapstore fixup #2792

Merged
merged 2 commits into from
Apr 2, 2021
Merged

chore: snapstore fixup #2792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe990fa
chore: lock packages after adding tmp for snapstore
dckc Apr 2, 2021
68af961
test(swingset): update local defaultManagerType config
dckc Apr 2, 2021
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
3 changes: 2 additions & 1 deletion packages/SwingSet/test/metering/test-dynamic-vat-unmetered.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ const localOnlyForNow = { defaultManagerType: 'local' };
test('unmetered dynamic vat', async t => {
const config = {
bootstrap: 'bootstrap',
...localOnlyForNow,
vats: {
bootstrap: {
sourceSpec: require.resolve('./vat-load-dynamic.js'),
},
},
};
const c = await buildVatController(config, [], localOnlyForNow);
const c = await buildVatController(config, []);
const nextLog = makeNextLog(c);

// let the vatAdminService get wired up before we create any new vats
Expand Down
3 changes: 2 additions & 1 deletion packages/SwingSet/test/metering/test-within-vat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ test('metering within a vat', async t => {
// we'll give this bundle to the vat, which will import it under metering
const bundle = await bundleSource(require.resolve('./metered-code.js'));
const config = {
...localOnlyForNow,
vats: {
within: {
sourceSpec: require.resolve('./vat-within.js'),
},
},
};
const c = await buildVatController(config, [], localOnlyForNow);
const c = await buildVatController(config, []);
const nextLog = makeNextLog(c);

// 'start' will import the bundle
Expand Down
5 changes: 2 additions & 3 deletions packages/SwingSet/test/test-device-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ test('bridge device can return undefined', async t => {
const storage = initSwingStore();
const config = {
bootstrap: 'bootstrap',
defaultManagerType: 'local',
vats: {
bootstrap: {
sourceSpec: require.resolve('./device-bridge-bootstrap.js'),
Expand All @@ -144,9 +145,7 @@ test('bridge device can return undefined', async t => {
argv[0] = { hello: 'from' };
argv[1] = ['swingset'];
await initializeSwingset(config, argv, storage.storage);
const c = await makeSwingsetController(storage.storage, deviceEndowments, {
defaultManagerType: 'local',
});
const c = await makeSwingsetController(storage.storage, deviceEndowments);
t.teardown(c.shutdown);
await c.run();

Expand Down
12 changes: 12 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2725,6 +2725,11 @@
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==

"@types/tmp@^0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.0.tgz#e3f52b4d7397eaa9193592ef3fdd44dc0af4298c"
integrity sha512-flgpHJjntpBAdJD43ShRosQvNC0ME97DCfGvZEDlAThQmnerRXrLbX6YgzRBQCZTthET9eAWFAMaYP0m0Y4HzQ==

"@typescript-eslint/eslint-plugin@^4.14.2":
version "4.18.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.18.0.tgz#50fbce93211b5b690895d20ebec6fe8db48af1f6"
Expand Down Expand Up @@ -12524,6 +12529,13 @@ tmp@^0.1.0:
dependencies:
rimraf "^2.6.3"

tmp@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
dependencies:
rimraf "^3.0.0"

to-fast-properties@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
Expand Down