refactor(vaultManager): inline recordShortfallAndProceeds

Agoric · May 16, 2023 · aa76acf · aa76acf
1 parent 3470475
commit aa76acf
Showing 1 changed file with 39 additions and 30 deletions.
diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js
@@ -496,28 +496,6 @@ export const prepareVaultManagerKit = (
             proceeds,
           );
         },
-
-        /** @type {(accounting: { overage: Amount<'nat'>, shortfall: Amount<'nat'> }) => void} */
-        recordShortfallAndProceeds(accounting) {
-          trace('recordShortfallAndProceeds', accounting);
-          const { state } = this;
-
-          const { overage, shortfall } = accounting;
-          // cumulative values
-          state.totalOverageReceived = AmountMath.add(
-            state.totalOverageReceived,
-            overage,
-          );
-          state.totalShortfallReceived = AmountMath.add(
-            state.totalShortfallReceived,
-            shortfall,
-          );
-          state.totalDebt = AmountMath.subtract(state.totalDebt, shortfall);
-
-          void E.when(factoryPowers.getShortfallReporter(), reporter =>
-            E(reporter).increaseLiquidationShortfall(shortfall),
-          );
-        },
         sendToReserve(penalty, seat, seatKeyword = 'Collateral') {
           const invitation =
             E(reservePublicFacet).makeAddCollateralInvitation();
@@ -555,9 +533,17 @@ export const prepareVaultManagerKit = (
 
           state.liquidatingDebt = AmountMath.add(state.liquidatingDebt, debt);
         },
-        markDoneLiquidating(debt, collateral) {
+        /**
+         *
+         * @param {Amount<'nat'>} debt
+         * @param {Amount<'nat'>} collateral
+         * @param {{ overage: Amount<'nat'>, shortfall: Amount<'nat'> }} accounting
+         */
+        markDoneLiquidating(debt, collateral, accounting) {
           const { state } = this;
 
+          // update liquidation state
+
           state.liquidatingCollateral = AmountMath.subtract(
             state.liquidatingCollateral,
             collateral,
@@ -566,6 +552,24 @@ export const prepareVaultManagerKit = (
             state.liquidatingDebt,
             debt,
           );
+
+          // record shortfall and proceeds
+
+          const { overage, shortfall } = accounting;
+          // cumulative values
+          state.totalOverageReceived = AmountMath.add(
+            state.totalOverageReceived,
+            overage,
+          );
+          state.totalShortfallReceived = AmountMath.add(
+            state.totalShortfallReceived,
+            shortfall,
+          );
+          state.totalDebt = AmountMath.subtract(state.totalDebt, shortfall);
+
+          void E.when(factoryPowers.getShortfallReporter(), reporter =>
+            E(reporter).increaseLiquidationShortfall(shortfall),
+          );
         },
         /**
          * If interest was charged between liquidating and liquidated, erase it.
@@ -715,8 +719,11 @@ export const prepareVaultManagerKit = (
               vaultData.getSize(),
             );
 
-            facets.helper.recordShortfallAndProceeds(accounting);
-            facets.helper.markDoneLiquidating(totalDebt, totalCollateral);
+            facets.helper.markDoneLiquidating(
+              totalDebt,
+              totalCollateral,
+              accounting,
+            );
           } else if (AmountMath.isEmpty(collateralProceeds)) {
             // Flow #2a
 
@@ -783,8 +790,11 @@ export const prepareVaultManagerKit = (
               vaultData.getSize(),
             );
 
-            facets.helper.recordShortfallAndProceeds(accounting);
-            facets.helper.markDoneLiquidating(totalDebt, totalCollateral);
+            facets.helper.markDoneLiquidating(
+              totalDebt,
+              totalCollateral,
+              accounting,
+            );
           } else {
             // Flow #2b: There's unsold collateral; some vaults may be revived.
 
@@ -875,9 +885,8 @@ export const prepareVaultManagerKit = (
             );
 
             facets.helper.sendToReserve(collatRemaining, liqSeat);
-            facets.helper.markDoneLiquidating(totalDebt, totalCollateral);
-            facets.helper.recordShortfallAndProceeds({
-              overage: accounting.overage,
+            facets.helper.markDoneLiquidating(totalDebt, totalCollateral, {
+              ...accounting,
               shortfall: shortfallToReserve,
             });
           }