refactor(vaultFactory!): vaultFactory use zcf.atomicRearrange

Agoric · Jul 19, 2023 · eb9a3cc · eb9a3cc
1 parent 6f740a4
commit eb9a3cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/packages/inter-protocol/src/vaultFactory/liquidation.js b/packages/inter-protocol/src/vaultFactory/liquidation.js
@@ -5,7 +5,6 @@ import { makeTracer } from '@agoric/internal';
 import { observeIteration, subscribeEach } from '@agoric/notifier';
 import { makeScalarMapStore } from '@agoric/store';
 import { TimeMath } from '@agoric/time';
-import { atomicRearrange } from '@agoric/zoe/src/contractSupport/index.js';
 import { E } from '@endo/eventual-send';
 
 import { AUCTION_START_DELAY, PRICE_LOCK_PERIOD } from '../auction/params.js';
@@ -288,7 +287,7 @@ export const getLiquidatableVaults = (
   }
 
   if (transfers.length > 0) {
-    atomicRearrange(zcf, harden(transfers));
+    zcf.atomicRearrange(harden(transfers));
   }
 
   return { vaultData, totalDebt, totalCollateral, liqSeat };

diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
@@ -14,7 +14,6 @@ import {
 } from '@agoric/vat-data';
 import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';
 import {
-  atomicRearrange,
   makeRecorderTopic,
   provideEmptySeat,
   SubscriberShape,
@@ -203,7 +202,7 @@ const prepareVaultDirector = (
         [mintSeat, mintReceiver, { Minted: kept }],
       ];
       try {
-        atomicRearrange(zcf, harden(transfers));
+        zcf.atomicRearrange(harden(transfers));
       } catch (e) {
         console.error('mintAndTransfer failed to rearrange', e);
         // If the rearrange fails, burn the newly minted tokens.

diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js
@@ -36,7 +36,6 @@ import {
 } from '@agoric/vat-data';
 import { TransferPartShape } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
 import {
-  atomicRearrange,
   ceilMultiplyBy,
   floorDivideBy,
   getAmountIn,
@@ -693,7 +692,7 @@ export const prepareVaultManagerKit = (
                   amounts,
                 ]),
             );
-            atomicRearrange(zcf, harden(transfers));
+            zcf.atomicRearrange(harden(transfers));
           }
 
           const { prioritizedVaults } = collateralEphemera(