chore: types clean-up

Agoric · Sep 20, 2024 · 1f9acb0 · 1f9acb0
1 parent 64440c9
commit 1f9acb0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/packages/orchestration/src/types.ts b/packages/orchestration/src/types.ts
@@ -14,17 +14,9 @@ export type * from './vat-orchestration.js';
 
 /**
  * ({@link ZCF})-like tools for use in {@link OrchestrationFlow}s.
- *
- * @interface
  */
-export type ZcfTools<CT = Record<string, unknown>> = Pick<
-  ZCF<CT>,
-  'atomicRearrange' | 'assertUniqueKeyword'
-> & {
-  makeInvitation: <R, A = undefined>(
-    offerHandler: OfferHandler<ERef<R>, A>,
-    description: string,
-    customDetails?: object,
-    proposalShape?: Pattern,
-  ) => Promise<Invitation<R, A>>;
-};
+export interface ZcfTools {
+  assertUniqueKeyword: ZCF['assertUniqueKeyword'];
+  atomicRearrange: ZCF['atomicRearrange'];
+  makeInvitation: ZCF['makeInvitation'];
+}
diff --git a/packages/orchestration/src/utils/zcf-tools.js b/packages/orchestration/src/utils/zcf-tools.js
@@ -1,5 +1,5 @@
 /**
- * @import {HostInterface, HostOf} from '@agoric/async-flow';
+ * @import {HostInterface} from '@agoric/async-flow';
  * @import {VowTools} from '@agoric/vow';
  * @import {ZcfTools} from '../types.js';
  */
@@ -11,11 +11,10 @@ const HandlerShape = M.remotable('OfferHandler');
 /**
  * @param {ZCF} zcf
  * @param {VowTools} vowTools
+ * @returns {HostInterface<ZcfTools>}
  */
-export const makeZcfTools = (zcf, vowTools) => {
-  /** @satisfies {HostInterface<ZcfTools>} */
-  const zcfForFlows = harden({
-    /** @type {HostOf<ZCF['makeInvitation']>} */
+export const makeZcfTools = (zcf, vowTools) =>
+  harden({
     makeInvitation(offerHandler, description, customDetails, proposalShape) {
       mustMatch(offerHandler, HandlerShape);
       return vowTools.watch(
@@ -27,15 +26,10 @@ export const makeZcfTools = (zcf, vowTools) => {
         ),
       );
     },
-    /** @type {ZCF['atomicRearrange']} */
     atomicRearrange(transfers) {
       zcf.atomicRearrange(transfers);
     },
-    /** @type {ZCF['assertUniqueKeyword']} */
     assertUniqueKeyword(keyword) {
       zcf.assertUniqueKeyword(keyword);
     },
   });
-
-  return zcfForFlows;
-};