From a925bba6ab66f75157df31c5771a0cfe20965ed4 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 15 May 2024 12:31:32 -0700 Subject: [PATCH] chore(types): clean up ambients/references --- packages/ERTP/src/paymentLedger.js | 4 +--- .../src/kernel/vat-loader/manager-subprocess-xsnap.js | 2 -- packages/agoric-cli/src/init.js | 4 ---- packages/base-zone/src/index.js | 4 +--- packages/benchmark/src/benchmarkerator.js | 6 ------ packages/boot/test/bootstrapTests/zcfProbe.js | 3 --- packages/boot/tools/supports.ts | 3 --- packages/cache/src/main.js | 4 +--- packages/deploy-script-support/src/helpers.js | 2 -- packages/governance/src/index.js | 7 +++---- .../governance/test/unitTests/binaryballotCount.test.js | 3 --- packages/governance/test/unitTests/committee.test.js | 3 --- .../governance/test/unitTests/paramChangePositions.test.js | 1 - packages/governance/test/unitTests/paramGovernance.test.js | 1 - packages/inter-protocol/src/auction/auctionBook.js | 6 ------ packages/inter-protocol/src/auction/auctioneer.js | 1 - packages/inter-protocol/src/econCommitteeCharter.js | 1 - packages/inter-protocol/src/psm/psm.js | 5 ----- packages/inter-protocol/src/vaultFactory/burn.js | 3 --- packages/inter-protocol/src/vaultFactory/type-imports.js | 4 ---- packages/inter-protocol/src/vaultFactory/vault.js | 3 --- packages/inter-protocol/src/vaultFactory/vaultDirector.js | 1 - packages/inter-protocol/src/vaultFactory/vaultFactory.js | 5 ----- packages/inter-protocol/src/vaultFactory/vaultKit.js | 2 -- packages/inter-protocol/src/vaultFactory/vaultManager.js | 1 - .../inter-protocol/test/auction/auctionContract.test.js | 2 -- .../inter-protocol/test/auction/proportionalDist.test.js | 2 -- packages/inter-protocol/test/auction/scheduleMath.test.js | 1 - packages/inter-protocol/test/interest-labeled.test.js | 1 - packages/inter-protocol/test/interest.test.js | 1 - packages/inter-protocol/test/psm/psm.test.js | 1 - packages/inter-protocol/test/vaultFactory/driver.js | 2 -- .../test/vaultFactory/prioritizedVaults.test.js | 1 - packages/inter-protocol/test/vaultFactory/proceeds.test.js | 1 - .../test/vaultFactory/replacePriceAuthority.test.js | 1 - packages/inter-protocol/test/vaultFactory/storage.test.js | 1 - .../test/vaultFactory/vault-interest.test.js | 1 - packages/inter-protocol/test/vaultFactory/vault.test.js | 1 - .../inter-protocol/test/vaultFactory/vaultFactory.test.js | 1 - .../inter-protocol/test/vaultFactory/vaultFactoryUtils.js | 2 -- .../test/vaultFactory/vaultLiquidation.test.js | 1 - packages/network/src/network.js | 2 +- packages/network/src/router.js | 6 +++--- packages/notifier/src/index.js | 3 +-- packages/orchestration/src/exos/chainAccountKit.js | 3 --- packages/orchestration/src/service.js | 3 --- packages/smart-wallet/src/invitations.js | 3 --- packages/smart-wallet/src/offers.js | 3 --- .../src/proposals/upgrade-wallet-factory2-proposal.js | 3 --- packages/smart-wallet/src/smartWallet.js | 3 --- packages/smart-wallet/src/utils.js | 4 ---- packages/swingset-liveslots/src/index.js | 3 +-- packages/time/src/types.d.ts | 2 -- packages/vats/src/nameHub.js | 1 - packages/vats/test/network.test.js | 1 - packages/wallet/api/src/lib-wallet.js | 1 - packages/zoe/src/contractFacet/zcfZygote.js | 3 --- packages/zoe/src/internal-types.js | 1 + packages/zoe/src/zoeService/escrowStorage.js | 1 - packages/zoe/src/zoeService/zoe.js | 6 ------ packages/zoe/src/zoeService/zoeStorageManager.js | 4 ++-- 61 files changed, 15 insertions(+), 140 deletions(-) delete mode 100644 packages/inter-protocol/src/vaultFactory/type-imports.js diff --git a/packages/ERTP/src/paymentLedger.js b/packages/ERTP/src/paymentLedger.js index 33ae4c658f08..de1452e00327 100644 --- a/packages/ERTP/src/paymentLedger.js +++ b/packages/ERTP/src/paymentLedger.js @@ -1,4 +1,5 @@ // @jessie-check +/// /* eslint-disable no-use-before-define */ import { isPromise } from '@endo/promise-kit'; @@ -7,9 +8,6 @@ import { AmountMath } from './amountMath.js'; import { preparePaymentKind } from './payment.js'; import { preparePurseKind } from './purse.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/store/exported.js'; - import { BrandI, makeIssuerInterfaces } from './typeGuards.js'; /** diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js index 712e6cce863e..dfbd2860e7cc 100644 --- a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js +++ b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js @@ -8,8 +8,6 @@ import { insistVatDeliveryResult, } from '../../lib/message.js'; -/// - /** * @import {VatDeliveryObject} from '@agoric/swingset-liveslots' * @import {VatDeliveryResult} from '@agoric/swingset-liveslots' diff --git a/packages/agoric-cli/src/init.js b/packages/agoric-cli/src/init.js index e2e3a0b51105..251ef5c230e8 100644 --- a/packages/agoric-cli/src/init.js +++ b/packages/agoric-cli/src/init.js @@ -1,10 +1,6 @@ import chalk from 'chalk'; import { makePspawn } from './helpers.js'; -/// -/// -/// - // Use either an absolute template URL, or find it relative to DAPP_URL_BASE. const gitURL = (relativeOrAbsoluteURL, base) => { const url = new URL(relativeOrAbsoluteURL, base); diff --git a/packages/base-zone/src/index.js b/packages/base-zone/src/index.js index 7a137f7d54f3..1c8e192d7f88 100644 --- a/packages/base-zone/src/index.js +++ b/packages/base-zone/src/index.js @@ -1,7 +1,5 @@ // @jessie-check - -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/store/exported.js'; +/// // eslint-disable-next-line import/export export * from './exports.js'; diff --git a/packages/benchmark/src/benchmarkerator.js b/packages/benchmark/src/benchmarkerator.js index 499717b60466..00a37e2e8749 100644 --- a/packages/benchmark/src/benchmarkerator.js +++ b/packages/benchmark/src/benchmarkerator.js @@ -4,12 +4,6 @@ import fs from 'node:fs'; import '@endo/init/pre-bundle-source.js'; import '@endo/init'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/vats/exported.js'; -import '@agoric/inter-protocol/exported.js'; -import '@agoric/zoe/exported.js'; -import '@agoric/cosmic-swingset/src/launch-chain.js'; - import { Fail } from '@agoric/assert'; import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js'; import { makeAgoricNamesRemotesFromFakeStorage } from '@agoric/vats/tools/board-utils.js'; diff --git a/packages/boot/test/bootstrapTests/zcfProbe.js b/packages/boot/test/bootstrapTests/zcfProbe.js index 0addf85a667f..5089ebdd6597 100644 --- a/packages/boot/test/bootstrapTests/zcfProbe.js +++ b/packages/boot/test/bootstrapTests/zcfProbe.js @@ -1,6 +1,3 @@ -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/exported.js'; - import { makeTracer } from '@agoric/internal'; import { E } from '@endo/far'; import { diff --git a/packages/boot/tools/supports.ts b/packages/boot/tools/supports.ts index 3f4d20153489..cb86ad11b1c5 100644 --- a/packages/boot/tools/supports.ts +++ b/packages/boot/tools/supports.ts @@ -18,9 +18,6 @@ import { loadSwingsetConfigFile } from '@agoric/swingset-vat'; import { makeSlogSender } from '@agoric/telemetry'; import { TimeMath, Timestamp } from '@agoric/time'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/vats/exported.js'; - import { boardSlottingMarshaller, slotToBoardRemote, diff --git a/packages/cache/src/main.js b/packages/cache/src/main.js index f13abd7ef3f6..3c648aa41599 100644 --- a/packages/cache/src/main.js +++ b/packages/cache/src/main.js @@ -1,7 +1,5 @@ // @jessie-check - -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/internal/exported.js'; +/// // eslint-disable-next-line import/export export * from './types.js'; diff --git a/packages/deploy-script-support/src/helpers.js b/packages/deploy-script-support/src/helpers.js index a2fb0617a82d..712351cd606c 100644 --- a/packages/deploy-script-support/src/helpers.js +++ b/packages/deploy-script-support/src/helpers.js @@ -1,7 +1,5 @@ // @ts-check -/// - import { E } from '@endo/far'; import bundleSource from '@endo/bundle-source'; diff --git a/packages/governance/src/index.js b/packages/governance/src/index.js index b3e2cc5a24df..830cf6292798 100644 --- a/packages/governance/src/index.js +++ b/packages/governance/src/index.js @@ -1,10 +1,9 @@ +/// +/// + // XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/internal/exported.js'; -import '@agoric/ertp/exported.js'; import '@agoric/zoe/exported.js'; -/// - export { ChoiceMethod, ElectionType, diff --git a/packages/governance/test/unitTests/binaryballotCount.test.js b/packages/governance/test/unitTests/binaryballotCount.test.js index b726078fe58f..6f4d9e2f670b 100644 --- a/packages/governance/test/unitTests/binaryballotCount.test.js +++ b/packages/governance/test/unitTests/binaryballotCount.test.js @@ -1,9 +1,6 @@ /* eslint @typescript-eslint/no-floating-promises: "warn" */ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/exported.js'; - import { E } from '@endo/eventual-send'; import buildManualTimer from '@agoric/zoe/tools/manualTimer.js'; import { makeHandle } from '@agoric/zoe/src/makeHandle.js'; diff --git a/packages/governance/test/unitTests/committee.test.js b/packages/governance/test/unitTests/committee.test.js index 5672490b2674..aad0a7c50f10 100644 --- a/packages/governance/test/unitTests/committee.test.js +++ b/packages/governance/test/unitTests/committee.test.js @@ -1,8 +1,5 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/exported.js'; - import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js'; import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js'; import buildManualTimer from '@agoric/zoe/tools/manualTimer.js'; diff --git a/packages/governance/test/unitTests/paramChangePositions.test.js b/packages/governance/test/unitTests/paramChangePositions.test.js index ebdba172c662..b6c4be193ae0 100644 --- a/packages/governance/test/unitTests/paramChangePositions.test.js +++ b/packages/governance/test/unitTests/paramChangePositions.test.js @@ -1,5 +1,4 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import '@agoric/zoe/exported.js'; import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/governance/test/unitTests/paramGovernance.test.js b/packages/governance/test/unitTests/paramGovernance.test.js index 0d277e861568..ed0fc3f18177 100644 --- a/packages/governance/test/unitTests/paramGovernance.test.js +++ b/packages/governance/test/unitTests/paramGovernance.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js'; diff --git a/packages/inter-protocol/src/auction/auctionBook.js b/packages/inter-protocol/src/auction/auctionBook.js index 46f63f036667..9a8f97615363 100644 --- a/packages/inter-protocol/src/auction/auctionBook.js +++ b/packages/inter-protocol/src/auction/auctionBook.js @@ -1,9 +1,3 @@ -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/internal/exported.js'; -import '@agoric/governance/exported.js'; -import '@agoric/zoe/exported.js'; -import '@agoric/zoe/src/contracts/exported.js'; - import { AmountMath, RatioShape } from '@agoric/ertp'; import { mustMatch } from '@agoric/store'; import { M, prepareExoClassKit } from '@agoric/vat-data'; diff --git a/packages/inter-protocol/src/auction/auctioneer.js b/packages/inter-protocol/src/auction/auctioneer.js index 88ace013d94e..f5dcfad887cc 100644 --- a/packages/inter-protocol/src/auction/auctioneer.js +++ b/packages/inter-protocol/src/auction/auctioneer.js @@ -1,5 +1,4 @@ import '@agoric/governance/exported.js'; -import '@agoric/zoe/exported.js'; import '@agoric/zoe/src/contracts/exported.js'; import { AmountMath, AmountShape, BrandShape } from '@agoric/ertp'; diff --git a/packages/inter-protocol/src/econCommitteeCharter.js b/packages/inter-protocol/src/econCommitteeCharter.js index 6fc146cb167d..f12f11339d91 100644 --- a/packages/inter-protocol/src/econCommitteeCharter.js +++ b/packages/inter-protocol/src/econCommitteeCharter.js @@ -4,7 +4,6 @@ import '@agoric/governance/exported.js'; import { M, mustMatch } from '@agoric/store'; import { TimestampShape } from '@agoric/time'; import { prepareExo, provideDurableMapStore } from '@agoric/vat-data'; -import '@agoric/zoe/exported.js'; import '@agoric/zoe/src/contracts/exported.js'; import { InstallationShape, diff --git a/packages/inter-protocol/src/psm/psm.js b/packages/inter-protocol/src/psm/psm.js index fbd44b7d496c..3901044d4da6 100644 --- a/packages/inter-protocol/src/psm/psm.js +++ b/packages/inter-protocol/src/psm/psm.js @@ -1,10 +1,5 @@ // @jessie-check -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/governance/exported.js'; -import '@agoric/zoe/exported.js'; -import '@agoric/zoe/src/contracts/exported.js'; - import { AmountMath, AmountShape, BrandShape, RatioShape } from '@agoric/ertp'; import { CONTRACT_ELECTORATE, diff --git a/packages/inter-protocol/src/vaultFactory/burn.js b/packages/inter-protocol/src/vaultFactory/burn.js index c8e5aee9f480..0c1772a74774 100644 --- a/packages/inter-protocol/src/vaultFactory/burn.js +++ b/packages/inter-protocol/src/vaultFactory/burn.js @@ -1,8 +1,5 @@ // @jessie-check -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/exported.js'; - import { E } from '@endo/eventual-send'; /** diff --git a/packages/inter-protocol/src/vaultFactory/type-imports.js b/packages/inter-protocol/src/vaultFactory/type-imports.js deleted file mode 100644 index e2055cd7249b..000000000000 --- a/packages/inter-protocol/src/vaultFactory/type-imports.js +++ /dev/null @@ -1,4 +0,0 @@ -// @jessie-check - -import '@agoric/zoe/exported.js'; -/// diff --git a/packages/inter-protocol/src/vaultFactory/vault.js b/packages/inter-protocol/src/vaultFactory/vault.js index 4a36efccfc3d..2216ad24f161 100644 --- a/packages/inter-protocol/src/vaultFactory/vault.js +++ b/packages/inter-protocol/src/vaultFactory/vault.js @@ -13,9 +13,6 @@ import { calculateCurrentDebt, reverseInterest } from '../interest-math.js'; import { calculateDebtCosts } from './math.js'; import { prepareVaultKit } from './vaultKit.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/exported.js'; - const { quote: q, Fail } = assert; const trace = makeTracer('Vault', true); diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js index 701dc0ac80cc..66d44f3b5c5f 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultDirector.js +++ b/packages/inter-protocol/src/vaultFactory/vaultDirector.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import '@agoric/zoe/src/contracts/exported.js'; import '@agoric/governance/exported.js'; diff --git a/packages/inter-protocol/src/vaultFactory/vaultFactory.js b/packages/inter-protocol/src/vaultFactory/vaultFactory.js index 2ee4f2001ae6..9e035dad4a29 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultFactory.js +++ b/packages/inter-protocol/src/vaultFactory/vaultFactory.js @@ -1,10 +1,5 @@ // @jessie-check -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/governance/exported.js'; -import '@agoric/zoe/exported.js'; -import '@agoric/zoe/src/contracts/exported.js'; - // The vaultFactory owns a number of VaultManagers and a mint for Minted. // // addVaultType is a closely held method that adds a brand new collateral type. diff --git a/packages/inter-protocol/src/vaultFactory/vaultKit.js b/packages/inter-protocol/src/vaultFactory/vaultKit.js index 4b6721d3bc72..e926fe97c135 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultKit.js +++ b/packages/inter-protocol/src/vaultFactory/vaultKit.js @@ -1,7 +1,5 @@ // @jessie-check -import '@agoric/zoe/exported.js'; - import { makeTracer } from '@agoric/internal'; import { prepareVaultHolder } from './vaultHolder.js'; diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js index c3f74b98bb0e..2b1f3b0dad3b 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultManager.js +++ b/packages/inter-protocol/src/vaultFactory/vaultManager.js @@ -16,7 +16,6 @@ * liquidated. If the auction is unsuccessful, the liquidation may be * reverted. */ -import '@agoric/zoe/exported.js'; import { AmountMath, diff --git a/packages/inter-protocol/test/auction/auctionContract.test.js b/packages/inter-protocol/test/auction/auctionContract.test.js index 912f803a132d..e3ca46a49e6d 100644 --- a/packages/inter-protocol/test/auction/auctionContract.test.js +++ b/packages/inter-protocol/test/auction/auctionContract.test.js @@ -1,7 +1,5 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import '@agoric/zoe/exported.js'; - import { AmountMath, makeIssuerKit } from '@agoric/ertp'; import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js'; import { deeplyFulfilledObject, makeTracer } from '@agoric/internal'; diff --git a/packages/inter-protocol/test/auction/proportionalDist.test.js b/packages/inter-protocol/test/auction/proportionalDist.test.js index 8583d205f575..e9969f5958c5 100644 --- a/packages/inter-protocol/test/auction/proportionalDist.test.js +++ b/packages/inter-protocol/test/auction/proportionalDist.test.js @@ -1,7 +1,5 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import '@agoric/zoe/exported.js'; - import { makeIssuerKit } from '@agoric/ertp'; import { makeTracer } from '@agoric/internal'; diff --git a/packages/inter-protocol/test/auction/scheduleMath.test.js b/packages/inter-protocol/test/auction/scheduleMath.test.js index 18c6e6736079..3358591d004b 100644 --- a/packages/inter-protocol/test/auction/scheduleMath.test.js +++ b/packages/inter-protocol/test/auction/scheduleMath.test.js @@ -2,7 +2,6 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { TimeMath } from '@agoric/time'; import { Far } from '@endo/marshal'; -import '@agoric/zoe/exported.js'; import { NonNullish } from '@agoric/assert'; import { diff --git a/packages/inter-protocol/test/interest-labeled.test.js b/packages/inter-protocol/test/interest-labeled.test.js index ac63dbac3545..c1ca9c7cac90 100644 --- a/packages/inter-protocol/test/interest-labeled.test.js +++ b/packages/inter-protocol/test/interest-labeled.test.js @@ -1,5 +1,4 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import '@agoric/zoe/exported.js'; import { makeIssuerKit } from '@agoric/ertp'; import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js'; diff --git a/packages/inter-protocol/test/interest.test.js b/packages/inter-protocol/test/interest.test.js index 913702480389..0fbc01ad525a 100644 --- a/packages/inter-protocol/test/interest.test.js +++ b/packages/inter-protocol/test/interest.test.js @@ -1,5 +1,4 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import '@agoric/zoe/exported.js'; import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; import { diff --git a/packages/inter-protocol/test/psm/psm.test.js b/packages/inter-protocol/test/psm/psm.test.js index 57a99dea2a62..47159fa359db 100644 --- a/packages/inter-protocol/test/psm/psm.test.js +++ b/packages/inter-protocol/test/psm/psm.test.js @@ -1,6 +1,5 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import '@agoric/zoe/exported.js'; import '../../src/vaultFactory/types-ambient.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/vaultFactory/driver.js b/packages/inter-protocol/test/vaultFactory/driver.js index f10a0afa28ad..c36759b7d9ce 100644 --- a/packages/inter-protocol/test/vaultFactory/driver.js +++ b/packages/inter-protocol/test/vaultFactory/driver.js @@ -1,5 +1,3 @@ -import '@agoric/zoe/exported.js'; - import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; import { allValues, makeTracer, objectMap } from '@agoric/internal'; import { makeNotifierFromSubscriber } from '@agoric/notifier'; diff --git a/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js b/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js index 081ab88d2dae..18dcfc0b53d1 100644 --- a/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js +++ b/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/vaultFactory/proceeds.test.js b/packages/inter-protocol/test/vaultFactory/proceeds.test.js index 67034e298844..bab8822109eb 100644 --- a/packages/inter-protocol/test/vaultFactory/proceeds.test.js +++ b/packages/inter-protocol/test/vaultFactory/proceeds.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js b/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js index 53f04b6bbfc2..6a09d4d25290 100644 --- a/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js +++ b/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/vaultFactory/storage.test.js b/packages/inter-protocol/test/vaultFactory/storage.test.js index a5f579afeaf7..ff823594bbfd 100644 --- a/packages/inter-protocol/test/vaultFactory/storage.test.js +++ b/packages/inter-protocol/test/vaultFactory/storage.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeTracer } from '@agoric/internal'; diff --git a/packages/inter-protocol/test/vaultFactory/vault-interest.test.js b/packages/inter-protocol/test/vaultFactory/vault-interest.test.js index ce2c938f430d..01ac44e96dd6 100644 --- a/packages/inter-protocol/test/vaultFactory/vault-interest.test.js +++ b/packages/inter-protocol/test/vaultFactory/vault-interest.test.js @@ -1,5 +1,4 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import '@agoric/zoe/exported.js'; import { E } from '@endo/eventual-send'; import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js'; diff --git a/packages/inter-protocol/test/vaultFactory/vault.test.js b/packages/inter-protocol/test/vaultFactory/vault.test.js index 9cdeb7fae509..77e03690c578 100644 --- a/packages/inter-protocol/test/vaultFactory/vault.test.js +++ b/packages/inter-protocol/test/vaultFactory/vault.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js'; diff --git a/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js b/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js index 6852667f7374..c73c589ea06c 100644 --- a/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js +++ b/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js b/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js index 7cc4157721d2..f11c2476afd8 100644 --- a/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js +++ b/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js @@ -1,5 +1,3 @@ -import '@agoric/zoe/exported.js'; - import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; import { makeNotifierFromSubscriber } from '@agoric/notifier'; import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js b/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js index 45cf37a1bf8e..4059beca1acc 100644 --- a/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js +++ b/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js @@ -1,4 +1,3 @@ -import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/network/src/network.js b/packages/network/src/network.js index 5d5d6ac46e07..b11c014c300c 100644 --- a/packages/network/src/network.js +++ b/packages/network/src/network.js @@ -1,4 +1,5 @@ // @ts-check +/// import { E } from '@endo/far'; import { M } from '@endo/patterns'; @@ -7,7 +8,6 @@ import { toBytes } from './bytes.js'; import { Shape } from './shapes.js'; import '@agoric/store/exported.js'; -/// /** * @import {AttemptDescription, Bytes, Closable, CloseReason, Connection, ConnectionHandler, Endpoint, ListenHandler, Port, Protocol, ProtocolHandler, ProtocolImpl} from './types.js'; */ diff --git a/packages/network/src/router.js b/packages/network/src/router.js index 477a23f4f35d..36753b2e8643 100644 --- a/packages/network/src/router.js +++ b/packages/network/src/router.js @@ -1,13 +1,13 @@ // @ts-check +/// +/// + import { E as defaultE } from '@endo/far'; import { M } from '@endo/patterns'; import { Fail } from '@agoric/assert'; import { ENDPOINT_SEPARATOR, prepareNetworkProtocol } from './network.js'; import { Shape } from './shapes.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/store/exported.js'; -/// /** * @import {AttemptDescription, Bytes, Closable, CloseReason, Connection, ConnectionHandler, Endpoint, ListenHandler, Port, Protocol, ProtocolHandler, ProtocolImpl} from './types.js'; * @import {PromiseVow, Remote, VowKit, VowResolver, VowTools} from '@agoric/vow'; diff --git a/packages/notifier/src/index.js b/packages/notifier/src/index.js index 2a5f7fd6723d..f397afd23d83 100644 --- a/packages/notifier/src/index.js +++ b/packages/notifier/src/index.js @@ -1,7 +1,6 @@ // @jessie-check -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/internal/exported.js'; +/// export { makePublishKit, diff --git a/packages/orchestration/src/exos/chainAccountKit.js b/packages/orchestration/src/exos/chainAccountKit.js index 4af29428257a..1781cfdc65af 100644 --- a/packages/orchestration/src/exos/chainAccountKit.js +++ b/packages/orchestration/src/exos/chainAccountKit.js @@ -1,8 +1,5 @@ /** @file ChainAccount exo */ -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/network/exported.js'; - import { NonNullish } from '@agoric/assert'; import { makeTracer } from '@agoric/internal'; import { V as E } from '@agoric/vow/vat.js'; diff --git a/packages/orchestration/src/service.js b/packages/orchestration/src/service.js index ae38835da588..be46cdd0288d 100644 --- a/packages/orchestration/src/service.js +++ b/packages/orchestration/src/service.js @@ -1,8 +1,5 @@ /** @file Orchestration service */ -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/network/exported.js'; - import { V as E } from '@agoric/vow/vat.js'; import { M } from '@endo/patterns'; import { Shape as NetworkShape } from '@agoric/network'; diff --git a/packages/smart-wallet/src/invitations.js b/packages/smart-wallet/src/invitations.js index 729686f67188..33483b8f7acc 100644 --- a/packages/smart-wallet/src/invitations.js +++ b/packages/smart-wallet/src/invitations.js @@ -4,9 +4,6 @@ import { InvitationHandleShape } from '@agoric/zoe/src/typeGuards.js'; import { E } from '@endo/far'; import { shape } from './typeGuards.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/exported.js'; - const { Fail } = assert; // A safety limit diff --git a/packages/smart-wallet/src/offers.js b/packages/smart-wallet/src/offers.js index 75f7685453e1..a5c87ecdbc98 100644 --- a/packages/smart-wallet/src/offers.js +++ b/packages/smart-wallet/src/offers.js @@ -1,6 +1,3 @@ -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/src/zoeService/types-ambient.js'; - /** * @typedef {number | string} OfferId */ diff --git a/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js b/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js index 2ebb86e3fc5d..60252d54616c 100644 --- a/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js +++ b/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js @@ -2,9 +2,6 @@ import { E } from '@endo/far'; import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/vats/src/core/types-ambient.js'; - /** * @param {BootstrapPowers & ChainBootstrapSpace} powers * @param {object} options diff --git a/packages/smart-wallet/src/smartWallet.js b/packages/smart-wallet/src/smartWallet.js index 34aa63d65939..f86c66f1ee96 100644 --- a/packages/smart-wallet/src/smartWallet.js +++ b/packages/smart-wallet/src/smartWallet.js @@ -42,9 +42,6 @@ import { shape } from './typeGuards.js'; import { objectMapStoragePath } from './utils.js'; import { prepareOfferWatcher, watchOfferOutcomes } from './offerWatcher.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/zoe/exported.js'; - const { Fail, quote: q } = assert; const trace = makeTracer('SmrtWlt'); diff --git a/packages/smart-wallet/src/utils.js b/packages/smart-wallet/src/utils.js index 39dee3cbbd21..9740bda94053 100644 --- a/packages/smart-wallet/src/utils.js +++ b/packages/smart-wallet/src/utils.js @@ -2,10 +2,6 @@ import { deeplyFulfilledObject, objectMap, makeTracer } from '@agoric/internal'; import { observeIteration, subscribeEach } from '@agoric/notifier'; import { E } from '@endo/far'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/internal/exported.js'; -import '@agoric/notifier/exported.js'; - export const NO_SMART_WALLET_ERROR = 'no smart wallet'; const trace = makeTracer('WUTIL', false); diff --git a/packages/swingset-liveslots/src/index.js b/packages/swingset-liveslots/src/index.js index 14f3b84af5dc..ac3a9ddb0e65 100644 --- a/packages/swingset-liveslots/src/index.js +++ b/packages/swingset-liveslots/src/index.js @@ -1,5 +1,4 @@ -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/store/exported.js'; +/// /* eslint-disable import/export -- types files have no named runtime exports */ export { makeLiveSlots, makeMarshaller } from './liveslots.js'; diff --git a/packages/time/src/types.d.ts b/packages/time/src/types.d.ts index 007f66c59397..40cb239c844c 100644 --- a/packages/time/src/types.d.ts +++ b/packages/time/src/types.d.ts @@ -2,8 +2,6 @@ import type { ERef, RemotableBrand } from '@endo/eventual-send'; import type { RankComparison, RemotableObject } from '@endo/marshal'; -/// - // These aren't in the global runtime environment. They are just types that are // meant to be globally accessible as a side-effect of importing this module. /** diff --git a/packages/vats/src/nameHub.js b/packages/vats/src/nameHub.js index d93d449fb134..ee27b884cdce 100644 --- a/packages/vats/src/nameHub.js +++ b/packages/vats/src/nameHub.js @@ -3,7 +3,6 @@ import { E } from '@endo/far'; import { makePromiseKit } from '@endo/promise-kit'; import { M, getInterfaceGuardPayload } from '@endo/patterns'; -/// import { makeSyncMethodCallback, prepareGuardedAttenuator, diff --git a/packages/vats/test/network.test.js b/packages/vats/test/network.test.js index f08d7d34bff1..636de11ee788 100644 --- a/packages/vats/test/network.test.js +++ b/packages/vats/test/network.test.js @@ -13,7 +13,6 @@ import { prepareVowTools } from '@agoric/vow/vat.js'; import { buildRootObject as ibcBuildRootObject } from '../src/vat-ibc.js'; import { buildRootObject as networkBuildRootObject } from '../src/vat-network.js'; -import '../src/types.js'; import { registerNetworkProtocols } from '../src/proposals/network-proposal.js'; const { fakeVomKit } = reincarnate({ relaxDurabilityRules: false }); diff --git a/packages/wallet/api/src/lib-wallet.js b/packages/wallet/api/src/lib-wallet.js index 50793f3fc3ef..c555c6b0183f 100644 --- a/packages/wallet/api/src/lib-wallet.js +++ b/packages/wallet/api/src/lib-wallet.js @@ -47,7 +47,6 @@ import '@agoric/store/exported.js'; import '@agoric/zoe/exported.js'; import './internal-types.js'; -/// // does nothing const noActionStateChangeHandler = _newState => {}; diff --git a/packages/zoe/src/contractFacet/zcfZygote.js b/packages/zoe/src/contractFacet/zcfZygote.js index bfd7f3bffba1..f412322f097b 100644 --- a/packages/zoe/src/contractFacet/zcfZygote.js +++ b/packages/zoe/src/contractFacet/zcfZygote.js @@ -27,9 +27,6 @@ import { createSeatManager } from './zcfSeat.js'; import { HandleOfferI, InvitationHandleShape } from '../typeGuards.js'; import { prepareZcMint } from './zcfMint.js'; -/// -/// - /** @import {IssuerOptionsRecord} from '@agoric/ertp' */ const { Fail } = assert; diff --git a/packages/zoe/src/internal-types.js b/packages/zoe/src/internal-types.js index b84970e0ffb8..8b1a0e91d928 100644 --- a/packages/zoe/src/internal-types.js +++ b/packages/zoe/src/internal-types.js @@ -1,4 +1,5 @@ // @jessie-check +/// /** * @typedef {object} SeatData diff --git a/packages/zoe/src/zoeService/escrowStorage.js b/packages/zoe/src/zoeService/escrowStorage.js index 6c20944d02b7..6deec97ffee3 100644 --- a/packages/zoe/src/zoeService/escrowStorage.js +++ b/packages/zoe/src/zoeService/escrowStorage.js @@ -4,7 +4,6 @@ import { q, Fail } from '@agoric/assert'; import { deeplyFulfilledObject, objectMap } from '@agoric/internal'; import { provideDurableWeakMapStore } from '@agoric/vat-data'; -/// import './internal-types.js'; import { cleanKeywords } from '../cleanProposal.js'; diff --git a/packages/zoe/src/zoeService/zoe.js b/packages/zoe/src/zoeService/zoe.js index 5a83d08bf0ab..0aed15254e5c 100644 --- a/packages/zoe/src/zoeService/zoe.js +++ b/packages/zoe/src/zoeService/zoe.js @@ -11,8 +11,6 @@ * validate that. */ -/// - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { makeScalarBigMapStore, prepareExo } from '@agoric/vat-data'; @@ -26,10 +24,6 @@ import { getZcfBundleCap } from './createZCFVat.js'; import { defaultFeeIssuerConfig, prepareFeeMint } from './feeMint.js'; import { ZoeServiceI } from '../typeGuards.js'; -// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512 -import '@agoric/internal/exported.js'; -import '@agoric/notifier/exported.js'; - /** @import {Baggage} from '@agoric/vat-data' */ const { Fail } = assert; diff --git a/packages/zoe/src/zoeService/zoeStorageManager.js b/packages/zoe/src/zoeService/zoeStorageManager.js index ae763e42adce..07763f95b71c 100644 --- a/packages/zoe/src/zoeService/zoeStorageManager.js +++ b/packages/zoe/src/zoeService/zoeStorageManager.js @@ -1,3 +1,5 @@ +/// + import { E } from '@endo/far'; import { AssetKind, @@ -21,8 +23,6 @@ import { prepareInvitationKit } from './makeInvitation.js'; import { makeInstanceAdminStorage } from './instanceAdminStorage.js'; import { makeInstallationStorage } from './installationStorage.js'; -/// -import './internal-types.js'; import { InstanceStorageManagerIKit, ZoeMintI,