From ea8568f7d2b67b10507d911c6585b1728ad3d011 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 15 Oct 2020 16:56:11 -0600 Subject: [PATCH] feat(zoe): export src/contractFacet/fakeVatAdmin for dapps --- packages/dapp-svelte-wallet/api/test/test-lib-wallet.js | 2 +- .../unitTests/contracts => src/contractFacet}/fakeVatAdmin.js | 2 +- packages/zoe/test/unitTests/contractSupport/test-depositTo.js | 2 +- .../zoe/test/unitTests/contractSupport/test-withdrawFrom.js | 2 +- packages/zoe/test/unitTests/setupBasicMints.js | 2 +- packages/zoe/test/unitTests/setupMixedMints.js | 2 +- packages/zoe/test/unitTests/setupNonFungibleMints.js | 2 +- packages/zoe/test/unitTests/zcf/setupZcfTest.js | 2 +- packages/zoe/test/unitTests/zcf/test-zcfSeat.js | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename packages/zoe/{test/unitTests/contracts => src/contractFacet}/fakeVatAdmin.js (95%) diff --git a/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js b/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js index d5985e16b00..8fda0974a41 100644 --- a/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js +++ b/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js @@ -6,7 +6,7 @@ import bundleSource from '@agoric/bundle-source'; import { makeIssuerKit, makeLocalAmountMath } from '@agoric/ertp'; import { makeZoe } from '@agoric/zoe'; -import fakeVatAdmin from '@agoric/zoe/test/unitTests/contracts/fakeVatAdmin'; +import fakeVatAdmin from '@agoric/zoe/src/contractFacet/fakeVatAdmin'; import { makeRegistrar } from '@agoric/registrar'; import { assert } from '@agoric/assert'; diff --git a/packages/zoe/test/unitTests/contracts/fakeVatAdmin.js b/packages/zoe/src/contractFacet/fakeVatAdmin.js similarity index 95% rename from packages/zoe/test/unitTests/contracts/fakeVatAdmin.js rename to packages/zoe/src/contractFacet/fakeVatAdmin.js index bb1f6fc484b..b41b7b8a2d3 100644 --- a/packages/zoe/test/unitTests/contracts/fakeVatAdmin.js +++ b/packages/zoe/src/contractFacet/fakeVatAdmin.js @@ -1,7 +1,7 @@ import { E } from '@agoric/eventual-send'; import { makePromiseKit } from '@agoric/promise-kit'; -import { evalContractBundle } from '../../../src/contractFacet/evalContractCode'; +import { evalContractBundle } from './evalContractCode'; function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) { // FakeVatPowers isn't intended to support testing of vat termination, it is diff --git a/packages/zoe/test/unitTests/contractSupport/test-depositTo.js b/packages/zoe/test/unitTests/contractSupport/test-depositTo.js index 3eed4f62dd1..347221e42b3 100644 --- a/packages/zoe/test/unitTests/contractSupport/test-depositTo.js +++ b/packages/zoe/test/unitTests/contractSupport/test-depositTo.js @@ -8,7 +8,7 @@ import bundleSource from '@agoric/bundle-source'; import { setup } from '../setupBasicMints'; import { makeZoe } from '../../..'; -import { makeFakeVatAdmin } from '../contracts/fakeVatAdmin'; +import { makeFakeVatAdmin } from '../../../src/contractFacet/fakeVatAdmin'; import { depositToSeat } from '../../../src/contractSupport/zoeHelpers'; const contractRoot = `${__dirname}/../zcf/zcfTesterContract`; diff --git a/packages/zoe/test/unitTests/contractSupport/test-withdrawFrom.js b/packages/zoe/test/unitTests/contractSupport/test-withdrawFrom.js index e3d38539115..4a627bd38d0 100644 --- a/packages/zoe/test/unitTests/contractSupport/test-withdrawFrom.js +++ b/packages/zoe/test/unitTests/contractSupport/test-withdrawFrom.js @@ -8,7 +8,7 @@ import bundleSource from '@agoric/bundle-source'; import { setup } from '../setupBasicMints'; import { makeZoe } from '../../..'; -import { makeFakeVatAdmin } from '../contracts/fakeVatAdmin'; +import { makeFakeVatAdmin } from '../../../src/contractFacet/fakeVatAdmin'; import { depositToSeat, withdrawFromSeat } from '../../../src/contractSupport'; import { assertPayoutAmount } from '../../zoeTestHelpers'; diff --git a/packages/zoe/test/unitTests/setupBasicMints.js b/packages/zoe/test/unitTests/setupBasicMints.js index 4f8f0e57793..cd3817c3330 100644 --- a/packages/zoe/test/unitTests/setupBasicMints.js +++ b/packages/zoe/test/unitTests/setupBasicMints.js @@ -1,6 +1,6 @@ import { makeIssuerKit } from '@agoric/ertp'; import { makeZoe } from '../../src/zoeService/zoe'; -import fakeVatAdmin from './contracts/fakeVatAdmin'; +import fakeVatAdmin from '../../src/contractFacet/fakeVatAdmin'; const setup = () => { const moolaBundle = makeIssuerKit('moola'); diff --git a/packages/zoe/test/unitTests/setupMixedMints.js b/packages/zoe/test/unitTests/setupMixedMints.js index 10067d2ade4..05f8adfed54 100644 --- a/packages/zoe/test/unitTests/setupMixedMints.js +++ b/packages/zoe/test/unitTests/setupMixedMints.js @@ -1,6 +1,6 @@ import { makeIssuerKit } from '@agoric/ertp'; import { makeZoe } from '../../src/zoeService/zoe'; -import fakeVatAdmin from './contracts/fakeVatAdmin'; +import fakeVatAdmin from '../../src/contractFacet/fakeVatAdmin'; const setupMixed = () => { const ccBundle = makeIssuerKit('CryptoCats', 'strSet'); diff --git a/packages/zoe/test/unitTests/setupNonFungibleMints.js b/packages/zoe/test/unitTests/setupNonFungibleMints.js index ad555b26c8d..7bed8f239b4 100644 --- a/packages/zoe/test/unitTests/setupNonFungibleMints.js +++ b/packages/zoe/test/unitTests/setupNonFungibleMints.js @@ -1,6 +1,6 @@ import { makeIssuerKit } from '@agoric/ertp'; import { makeZoe } from '../../src/zoeService/zoe'; -import fakeVatAdmin from './contracts/fakeVatAdmin'; +import fakeVatAdmin from '../../src/contractFacet/fakeVatAdmin'; const setupNonFungible = () => { const ccBundle = makeIssuerKit('CryptoCats', 'strSet'); diff --git a/packages/zoe/test/unitTests/zcf/setupZcfTest.js b/packages/zoe/test/unitTests/zcf/setupZcfTest.js index 2e22b46bbfb..d60b90ec96e 100644 --- a/packages/zoe/test/unitTests/zcf/setupZcfTest.js +++ b/packages/zoe/test/unitTests/zcf/setupZcfTest.js @@ -3,7 +3,7 @@ import bundleSource from '@agoric/bundle-source'; // noinspection ES6PreferShortImport import { makeZoe } from '../../../src/zoeService/zoe'; -import { makeFakeVatAdmin } from '../contracts/fakeVatAdmin'; +import { makeFakeVatAdmin } from '../../../src/contractFacet/fakeVatAdmin'; const contractRoot = `${__dirname}/zcfTesterContract`; diff --git a/packages/zoe/test/unitTests/zcf/test-zcfSeat.js b/packages/zoe/test/unitTests/zcf/test-zcfSeat.js index ce752f5dd4c..270735abc18 100644 --- a/packages/zoe/test/unitTests/zcf/test-zcfSeat.js +++ b/packages/zoe/test/unitTests/zcf/test-zcfSeat.js @@ -9,7 +9,7 @@ import bundleSource from '@agoric/bundle-source'; // noinspection ES6PreferShortImport import { makeZoe } from '../../../src/zoeService/zoe'; import { setup } from '../setupBasicMints'; -import { makeFakeVatAdmin } from '../contracts/fakeVatAdmin'; +import { makeFakeVatAdmin } from '../../../src/contractFacet/fakeVatAdmin'; import '../../../exported';