chore: minor cleanups and conflict reduction

Agoric · Nov 1, 2023 · 9f38ecc · 9f38ecc
1 parent 2096070
commit 9f38ecc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/packages/agoric-cli/src/commands/inter.js b/packages/agoric-cli/src/commands/inter.js
@@ -101,7 +101,7 @@ const makeFormatters = assets => {
 /**
  * Dynamic check that an OfferStatus is also a BidSpec.
  *
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus} offerStatus
+ * @param {import('@agoric/smart-wallet/src/offerWatcher.js').OfferStatus} offerStatus
  * @param {import('../lib/wallet.js').AgoricNamesRemotes} agoricNames
  * @param {typeof console.warn} warn
  * returns null if offerStatus is not a BidSpec
@@ -125,7 +125,7 @@ const coerceBid = (offerStatus, agoricNames, warn) => {
   }
 
   /**
-   * @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus &
+   * @type {import('@agoric/smart-wallet/src/offerWatcher.js').OfferStatus &
    *        { offerArgs: BidSpec}}
    */
   // @ts-expect-error dynamic cast
@@ -136,7 +136,7 @@ const coerceBid = (offerStatus, agoricNames, warn) => {
 /**
  * Format amounts etc. in a BidSpec OfferStatus
  *
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus &
+ * @param {import('@agoric/smart-wallet/src/offerWatcher.js').OfferStatus &
  *         { offerArgs: BidSpec}} bid
  * @param {import('agoric/src/lib/format.js').AssetDescriptor[]} assets
  */

diff --git a/packages/boot/test/bootstrapTests/drivers.ts b/packages/boot/test/bootstrapTests/drivers.ts
@@ -17,9 +17,9 @@ import type {
   CurrentWalletRecord,
   SmartWallet,
   UpdateRecord,
+  OfferSpec,
 } from '@agoric/smart-wallet/src/smartWallet.js';
 import type { WalletFactoryStartResult } from '@agoric/vats/src/core/startWalletFactory.js';
-import type { OfferSpec } from '@agoric/smart-wallet/src/offers.js';
 import type { TimerService } from '@agoric/time/src/types.js';
 import type { OfferMaker } from '@agoric/smart-wallet/src/types.js';
 import type { RunUtils, SwingsetTestKit } from './supports.ts';

diff --git a/packages/boot/test/bootstrapTests/liquidation.ts b/packages/boot/test/bootstrapTests/liquidation.ts
@@ -65,7 +65,7 @@ export const likePayouts = ({ Bid, Collateral }) => ({
 
 export const makeWalletFactoryContext = async t => {
   const swingsetTestKit = await makeSwingsetTestKit(t.log, 'bundles/vaults', {
-    configSpecifier: '@agoric/vm-config/decentral-main-vaults-config.json'
+    configSpecifier: '@agoric/vm-config/decentral-main-vaults-config.json',
   });
 
   const { runUtils, storage } = swingsetTestKit;
@@ -82,7 +82,7 @@ export const makeWalletFactoryContext = async t => {
   const refreshAgoricNamesRemotes = () => {
     Object.assign(
       agoricNamesRemotes,
-      makeAgoricNamesRemotesFromFakeStorage(swingsetTestKit.storage)
+      makeAgoricNamesRemotesFromFakeStorage(swingsetTestKit.storage),
     );
   };
   agoricNamesRemotes.brand.ATOM || Fail`ATOM missing from agoricNames`;
@@ -91,7 +91,7 @@ export const makeWalletFactoryContext = async t => {
   const walletFactoryDriver = await makeWalletFactoryDriver(
     runUtils,
     storage,
-    agoricNamesRemotes
+    agoricNamesRemotes,
   );
   return {
     ...swingsetTestKit,
@@ -112,8 +112,8 @@ export const makeLiquidationTestContext = async t => {
     swingsetTestKit,
     agoricNamesRemotes,
     refreshAgoricNamesRemotes,
-    walletFactoryDriver
-  }  = await makeWalletFactoryContext(t);
+    walletFactoryDriver,
+  } = await makeWalletFactoryContext(t);
 
   console.timeLog('DefaultTestContext', 'walletFactoryDriver');
 

diff --git a/packages/boot/test/bootstrapTests/test-walletSurvivesZoeRestart.ts b/packages/boot/test/bootstrapTests/test-walletSurvivesZoeRestart.ts
@@ -4,14 +4,13 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 import process from 'process';
 import type { ExecutionContext, TestFn } from 'ava';
 
-import { ERef } from '@endo/far';
 import { BridgeHandler } from '@agoric/vats';
+import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import {
   LiquidationTestContext,
   makeLiquidationTestContext,
   LiquidationSetup,
 } from './liquidation.ts';
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 
 const test = anyTest as TestFn<LiquidationTestContext>;
 

diff --git a/packages/smart-wallet/src/smartWallet.js b/packages/smart-wallet/src/smartWallet.js
@@ -265,7 +265,6 @@ export const prepareSmartWallet = (baggage, shared) => {
   const makeOfferWatcher = makeOfferWatcherMaker(baggage);
 
   /**
-   *
    * @param {UniqueParams} unique
    * @returns {State}
    */
-Original file line number
+Diff line change
@@ Expand Up / @@ -265,7 +265,6 @@ export const prepareSmartWallet = (baggage, shared) => { @@
       const makeOfferWatcher = makeOfferWatcherMaker(baggage);
       /**
-       *
        * @param {UniqueParams} unique
        * @returns {State}
        */
@@ Expand Down @@