refactor: importSpec sync compat

Rice2220 · Feb 13, 2025 · 7bff6b3 · 7bff6b3
1 parent fbaf965
commit 7bff6b3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/packages/boot/test/upgrading/upgrade-contracts.test.js b/packages/boot/test/upgrading/upgrade-contracts.test.js
@@ -13,8 +13,8 @@ import { buildVatController } from '@agoric/swingset-vat';
 const test = anyTest;
 
 const bfile = name => new URL(name, import.meta.url).pathname;
-const importSpec = spec =>
-  importMetaResolve(spec, import.meta.url).then(u => new URL(u).pathname);
+const importSpec = async spec =>
+  new URL(importMetaResolve(spec, import.meta.url)).pathname;
 
 test('upgrade mintHolder', async t => {
   /** @type {SwingSetConfig} */

diff --git a/packages/boot/test/upgrading/upgrade-vats.test.ts b/packages/boot/test/upgrading/upgrade-vats.test.ts
@@ -12,8 +12,8 @@ import { matchAmount, matchIter, matchRef } from '../../tools/supports.js';
 import type { buildRootObject as buildTestMintVat } from './vat-mint.js';
 
 const bfile = name => new URL(name, import.meta.url).pathname;
-const importSpec = spec =>
-  importMetaResolve(spec, import.meta.url).then(u => new URL(u).pathname);
+const importSpec = async spec =>
+  new URL(importMetaResolve(spec, import.meta.url)).pathname;
 
 const makeCallOutbound = t => (srcID, obj) => {
   t.log(`callOutbound(${srcID}, ${obj})`);

diff --git a/packages/boot/tools/supports.ts b/packages/boot/tools/supports.ts
@@ -163,13 +163,13 @@ interface Powers {
   fs: typeof import('node:fs/promises');
 }
 
+const importSpec = async spec =>
+  new URL(importMetaResolve(spec, import.meta.url)).pathname;
+
 export const makeProposalExtractor = ({ childProcess, fs }: Powers) => {
   const getPkgPath = (pkg, fileName = '') =>
     new URL(`../../${pkg}/${fileName}`, import.meta.url).pathname;
 
-  const importSpec = spec =>
-    importMetaResolve(spec, import.meta.url).then(u => new URL(u).pathname);
-
   const runPackageScript = (
     outputDir: string,
     scriptPath: string,

diff --git a/packages/smart-wallet/test/addAsset.test.js b/packages/smart-wallet/test/addAsset.test.js
@@ -15,8 +15,8 @@ import { makeDefaultTestContext } from './contexts.js';
 import { ActionType, headValue, makeMockTestSpace } from './supports.js';
 import { makeImportContext } from '../src/marshal-contexts.js';
 
-const importSpec = spec =>
-  importMetaResolve(spec, import.meta.url).then(u => new URL(u).pathname);
+const importSpec = async spec =>
+  new URL(importMetaResolve(spec, import.meta.url)).pathname;
 
 /**
  * @type {import('ava').TestFn<

diff --git a/...mart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-service-upgrade.test.js b/...mart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-service-upgrade.test.js
@@ -12,8 +12,8 @@ import {
 // so paths can be expresssed relative to this file and made absolute
 const bfile = name => new URL(name, import.meta.url).pathname;
 
-const importSpec = spec =>
-  importMetaResolve(spec, import.meta.url).then(u => new URL(u).pathname);
+const importSpec = async spec =>
+  new URL(importMetaResolve(spec, import.meta.url)).pathname;
 
 test('walletFactory service upgrade', async t => {
   /** @type {SwingSetConfig} */