From 229c6052547885348f74d7843f760e5a2f8b302a Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Thu, 19 Sep 2024 13:32:16 -0500 Subject: [PATCH] fixup! chore: punt on exo for zcfTools --- packages/orchestration/src/utils/start-helper.js | 2 +- .../orchestration/src/{exos => utils}/zcf-tools.js | 12 ------------ .../test/{exos => utils}/zcf-tools.test.ts | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) rename packages/orchestration/src/{exos => utils}/zcf-tools.js (81%) rename packages/orchestration/test/{exos => utils}/zcf-tools.test.ts (97%) diff --git a/packages/orchestration/src/utils/start-helper.js b/packages/orchestration/src/utils/start-helper.js index 4cabfed1e30..d66700df50b 100644 --- a/packages/orchestration/src/utils/start-helper.js +++ b/packages/orchestration/src/utils/start-helper.js @@ -10,7 +10,7 @@ import { prepareOrchestrator } from '../exos/orchestrator.js'; import { prepareRemoteChainFacade } from '../exos/remote-chain-facade.js'; import { makeOrchestrationFacade } from '../facade.js'; import { makeZoeTools } from './zoe-tools.js'; -import { makeZcfTools } from '../exos/zcf-tools.js'; +import { makeZcfTools } from './zcf-tools.js'; /** * @import {LocalChain} from '@agoric/vats/src/localchain.js'; diff --git a/packages/orchestration/src/exos/zcf-tools.js b/packages/orchestration/src/utils/zcf-tools.js similarity index 81% rename from packages/orchestration/src/exos/zcf-tools.js rename to packages/orchestration/src/utils/zcf-tools.js index 75458857297..9cb677ca720 100644 --- a/packages/orchestration/src/exos/zcf-tools.js +++ b/packages/orchestration/src/utils/zcf-tools.js @@ -9,18 +9,6 @@ import { VowShape } from '@agoric/vow'; import { M } from '@endo/patterns'; -export const ZcfToolsI = M.interface( - 'ZCF', - { - makeInvitation: M.call(M.remotable('OfferHandler'), M.string()) - .optional(M.record(), M.pattern()) - .returns(VowShape), - }, - { - defaultGuards: 'passable', - }, -); - /** * @param {ZCF} zcf * @param {VowTools} vowTools diff --git a/packages/orchestration/test/exos/zcf-tools.test.ts b/packages/orchestration/test/utils/zcf-tools.test.ts similarity index 97% rename from packages/orchestration/test/exos/zcf-tools.test.ts rename to packages/orchestration/test/utils/zcf-tools.test.ts index b81267af899..61f699233f8 100644 --- a/packages/orchestration/test/exos/zcf-tools.test.ts +++ b/packages/orchestration/test/utils/zcf-tools.test.ts @@ -8,7 +8,7 @@ import { makeNodeBundleCache } from '@endo/bundle-source/cache.js'; import { E, Far } from '@endo/far'; import type { TestFn } from 'ava'; import { createRequire } from 'node:module'; -import { makeZcfTools } from '../../src/exos/zcf-tools.js'; +import { makeZcfTools } from '../../src/utils/zcf-tools.js'; import { provideDurableZone } from '../supports.js'; const nodeRequire = createRequire(import.meta.url);