refactor: rename auctionsDone flag, remove it after use

Agoric · Aug 19, 2024 · aa11426 · aa11426
1 parent d1a4c51
commit aa11426
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/packages/inter-protocol/src/proposals/add-auction.js b/packages/inter-protocol/src/proposals/add-auction.js
@@ -8,7 +8,7 @@ const trace = makeTracer('NewAuction', true);
 
 /**
  * @typedef {PromiseSpaceOf<{
- *   auctionsDone: boolean;
+ *   auctionsUpgradeComplete: boolean;
  * }>} interlockPowers
  */
 
@@ -26,7 +26,7 @@ export const addAuction = async ({
     economicCommitteeCreatorFacet: electorateCreatorFacet,
     auctioneerKit: legacyKitP,
   },
-  produce: { newAuctioneerKit, auctionsDone },
+  produce: { newAuctioneerKit, auctionsUpgradeComplete },
   instance: {
     consume: { reserve: reserveInstance },
   },
@@ -153,7 +153,7 @@ export const addAuction = async ({
   // don't overwrite auctioneerKit or auction instance yet. Wait until
   // upgrade-vault.js
 
-  auctionsDone.resolve(true);
+  auctionsUpgradeComplete.resolve(true);
 };
 
 export const ADD_AUCTION_MANIFEST = harden({
@@ -169,7 +169,7 @@ export const ADD_AUCTION_MANIFEST = harden({
     },
     produce: {
       newAuctioneerKit: true,
-      auctionsDone: true,
+      auctionsUpgradeComplete: true,
     },
     instance: {
       consume: { reserve: true },

diff --git a/packages/inter-protocol/src/proposals/upgrade-vaults.js b/packages/inter-protocol/src/proposals/upgrade-vaults.js
@@ -32,7 +32,7 @@ const any = promises =>
 
 /**
  * @typedef {PromiseSpaceOf<{
- *   auctionsDone: boolean;
+ *   auctionsUpgradeComplete: boolean;
  * }>} interlockPowers
  */
 
@@ -51,11 +51,12 @@ export const upgradeVaults = async (powers, { options }) => {
       zoe,
       economicCommitteeCreatorFacet: electorateCreatorFacet,
       reserveKit,
-      auctionsDone,
+      auctionsUpgradeComplete,
     },
     produce: {
       auctioneerKit: auctioneerKitProducer,
       newAuctioneerKit: tempAuctioneerKit,
+      auctionsUpgradeComplete: auctionsUpgradeCompleteProducer,
     },
     instance: {
       produce: { auctioneer: auctioneerProducer },
@@ -77,7 +78,8 @@ export const upgradeVaults = async (powers, { options }) => {
    */
   let installationP;
 
-  await auctionsDone;
+  await auctionsUpgradeComplete;
+  auctionsUpgradeCompleteProducer.reset();
 
   if (vaultsRef) {
     if (bundleID) {
@@ -271,9 +273,13 @@ export const getManifestForUpgradeVaults = async (
         vaultFactoryKit: uV,
         board: uV,
         zoe: uV,
-        auctionsDone: uV,
+        auctionsUpgradeComplete: uV,
+      },
+      produce: {
+        auctioneerKit: uV,
+        newAuctioneerKit: uV,
+        auctionsUpgradeComplete: uV,
       },
-      produce: { auctioneerKit: uV, newAuctioneerKit: uV },
       instance: { produce: { auctioneer: uV, newAuctioneerKit: uV } },
     },
   },