fixup! test: bootstrap test for portfolio holder

Agoric · Jul 17, 2024 · 92ac64b · 92ac64b
1 parent ca2df2c
commit 92ac64b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/packages/boot/test/bootstrapTests/orchestration.test.ts b/packages/boot/test/bootstrapTests/orchestration.test.ts
@@ -366,7 +366,7 @@ test.serial('basic-flows - portfolio holder', async t => {
       invitationSpec: {
         source: 'continuing',
         previousOffer: 'request-portfolio-acct',
-        invitationMakerName: 'Action',
+        invitationMakerName: 'MakeInvitation',
         invitationArgs: [
           'cosmoshub',
           'Delegate',
@@ -386,7 +386,7 @@ test.serial('basic-flows - portfolio holder', async t => {
       invitationSpec: {
         source: 'continuing',
         previousOffer: 'request-portfolio-acct',
-        invitationMakerName: 'Action',
+        invitationMakerName: 'MakeInvitation',
         invitationArgs: [
           'agoric',
           'Delegate',
@@ -407,7 +407,7 @@ test.serial('basic-flows - portfolio holder', async t => {
       invitationSpec: {
         source: 'continuing',
         previousOffer: 'request-portfolio-acct',
-        invitationMakerName: 'Action',
+        invitationMakerName: 'MakeInvitation',
         invitationArgs: [
           'cosmoshub',
           'Delegate',
@@ -424,7 +424,7 @@ test.serial('basic-flows - portfolio holder', async t => {
       invitationSpec: {
         source: 'continuing',
         previousOffer: 'request-portfolio-acct',
-        invitationMakerName: 'Action',
+        invitationMakerName: 'MakeInvitation',
         invitationArgs: [
           'agoric',
           'Delegate',

diff --git a/packages/orchestration/src/examples/basic-flows.contract.js b/packages/orchestration/src/examples/basic-flows.contract.js
@@ -4,15 +4,16 @@
  */
 import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
 import { M, mustMatch } from '@endo/patterns';
-import { provideOrchestration } from '../utils/start-helper.js';
+import { withOrchestration } from '../utils/start-helper.js';
 import { preparePortfolioHolder } from '../exos/portfolio-holder-kit.js';
 
 /**
- * @import {Baggage} from '@agoric/vat-data';
+ * @import {Zone} from '@agoric/zone';
  * @import {OrchestrationAccount, Orchestrator} from '@agoric/orchestration';
  * @import {ResolvedPublicTopic} from '@agoric/zoe/src/contractSupport/topics.js';
  * @import {OrchestrationPowers} from '../utils/start-helper.js';
  * @import {MakePortfolioHolder} from '../exos/portfolio-holder-kit.js';
+ * @import {OrchestrationTools} from '../utils/start-helper.js';
  */
 
 /**
@@ -35,8 +36,8 @@ const makeOrchAccountHandler = async (orch, _ctx, seat, { chainName }) => {
 /**
  * Create accounts on multiple chains and return them in a single continuing
  * offer with invitations makers for Delegate, WithdrawRewards, Transfer, etc.
- * Calls to the underlying invitationMakers are proxied through the `Action`
- * invitation maker.
+ * Calls to the underlying invitationMakers are proxied through the
+ * `MakeInvitation` invitation maker.
  *
  * @param {Orchestrator} orch
  * @param {MakePortfolioHolder} makePortfolioHolder
@@ -81,16 +82,11 @@ const makePortfolioAcctHandler = async (
  * @param {ZCF} zcf
  * @param {OrchestrationPowers & {
  *   marshaller: Marshaller;
- * }} privateArgs
- * @param {Baggage} baggage
+ * }} _privateArgs
+ * @param {Zone} zone
+ * @param {OrchestrationTools} tools
  */
-export const start = async (zcf, privateArgs, baggage) => {
-  const { orchestrate, vowTools, zone } = provideOrchestration(
-    zcf,
-    baggage,
-    privateArgs,
-    privateArgs.marshaller,
-  );
+const contract = async (zcf, _privateArgs, zone, { orchestrate, vowTools }) => {
   const makePortfolioHolder = preparePortfolioHolder(
     zone.subZone('portfolio'),
     vowTools,
@@ -133,4 +129,6 @@ export const start = async (zcf, privateArgs, baggage) => {
   return { publicFacet };
 };
 
+export const start = withOrchestration(contract);
+
 /** @typedef {typeof start} BasicFlowsSF */