test: repair some tests

Agoric · May 2, 2024 · d8818d8 · d8818d8
1 parent 4f9740b
commit d8818d8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/packages/boot/test/bootstrapTests/test-vaults-upgrade.ts b/packages/boot/test/bootstrapTests/test-vaults-upgrade.ts
@@ -287,8 +287,25 @@ test.serial('restart vaultFactory', async t => {
  'vaultFactoryKit',
  ) as EconomyBootstrapSpace['consume']['vaultFactoryKit']);
 
- // @ts-expect-error cast XXX missing from type
- const { privateArgs } = vaultFactoryKit;
+ const reserveKit = await (EV.vat('bootstrap').consumeItem(
+ 'reserveKit',
+ ) as EconomyBootstrapSpace['consume']['reserveKit']);
+ const bootstrapVat = EV.vat('bootstrap');
+ const electorateCreatorFacet = await (bootstrapVat.consumeItem(
+ 'economicCommitteeCreatorFacet',
+ ) as EconomyBootstrapSpace['consume']['economicCommitteeCreatorFacet']);
+
+ const poserInvitation = await EV(electorateCreatorFacet).getPoserInvitation();
+ const creatorFacet1 = await EV.get(reserveKit).creatorFacet;
+ const shortfallInvitation =
+ await EV(creatorFacet1).makeShortfallReportingInvitation();
+
+ const privateArgs = {
+ // @ts-expect-error cast XXX missing from type
+ ...vaultFactoryKit.privateArgs,
+ initialPoserInvitation: poserInvitation,
+ initialShortfallInvitation: shortfallInvitation,
+ };
  console.log('reused privateArgs', privateArgs, vaultFactoryKit);
 
  const vfAdminFacet = await EV(

diff --git a/packages/governance/test/swingsetTests/contractGovernor/test-governor.js b/packages/governance/test/swingsetTests/contractGovernor/test-governor.js
@@ -162,8 +162,8 @@ test.serial('brokenUpdateStart', async t => {
  // TODO: allow either message
  // 'vote rejected outcome: Error: (an object) was not a live payment for brand (an object). It could be a used-up payment, a payment for another brand, or it might not be a payment at all.',
  // 'update failed: Error: (an object) was not a live payment for brand (an object). It could be a used-up payment, a payment for another brand, or it might not be a payment at all.',
- 'vote rejected outcome: Error: A Zoe invitation is required, not (an object)',
- 'update failed: Error: A Zoe invitation is required, not (an object)',
+ 'vote rejected outcome: Error: (an object) was not a live payment for brand "[Alleged: Zoe Invitation brand]". It could be a used-up payment, a payment for another brand, or it might not be a payment at all.',
+ 'update failed: Error: (an object) was not a live payment for brand "[Alleged: Zoe Invitation brand]". It could be a used-up payment, a payment for another brand, or it might not be a payment at all.',
  ]);
 });
 

diff --git a/packages/governance/test/unitTests/test-puppetContractGovernor.js b/packages/governance/test/unitTests/test-puppetContractGovernor.js
@@ -59,7 +59,7 @@ test('multiple params bad change', async t => {
  () => E(governorFacets.creatorFacet).changeParams(paramChangesSpec),
  {
  message:
- 'In "getInvitationDetails" method of (ZoeService): arg 0: "[13n]" - Must match one of ["[match:remotable]","[match:kind]"]',
+ 'In "getAmountOf" method of (Zoe Invitation issuer): arg 0: "[13n]" - Must be a remotable Payment, not bigint',
  },
  );
 });

diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js
@@ -210,9 +210,9 @@ export const provideVaultParamManagers = (
 
  // restore from baggage, unless `managerParamOverrides` overrides.
  for (const [brand, args] of managerArgs.entries()) {
- const newInitial = Object.values(managerParamOverrides).find(
- e => e.brand === brand,
- );
+ const newInitial = managerParamOverrides
+ ? Object.values(managerParamOverrides).find(e => e.brand === brand)
+  : undefined;
 
  if (newInitial) {
  trace(`reviving params, override`, brand, newInitial);