chore: lint and merge conflict fixes

Agoric · Dec 5, 2023 · ababbe9 · ababbe9
1 parent 3cf7cc4
commit ababbe9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/smart-wallet/src/offerWatcher.js b/packages/smart-wallet/src/offerWatcher.js
@@ -201,6 +201,10 @@ export const makeOfferWatcherMaker = baggage => {
           const amounts = await deeplyFulfilledObject(amountPKeywordRecord);
           facets.helper.updateStatus({ payouts: amounts });
         },
+        /**
+         * @param {Error} err
+         * @param {UserSeat} seat
+         */
         onRejected(err, seat) {
           const { facets } = this;
 
@@ -219,6 +223,10 @@ export const makeOfferWatcherMaker = baggage => {
           const { facets } = this;
           facets.helper.publishResult(result);
         },
+        /**
+         * @param {Error} err
+         * @param {UserSeat} seat
+         */
         onRejected(err, seat) {
           const { facets } = this;
           if (isUpgradeDisconnection(err)) {
@@ -237,6 +245,10 @@ export const makeOfferWatcherMaker = baggage => {
 
           facets.helper.updateStatus({ numWantsSatisfied: numSatisfied });
         },
+        /**
+         * @param {Error} err
+         * @param {UserSeat} seat
+         */
         onRejected(err, seat) {
           const { facets } = this;
           if (isUpgradeDisconnection(err)) {

diff --git a/packages/swingset-liveslots/src/watchedPromises.js b/packages/swingset-liveslots/src/watchedPromises.js
@@ -9,12 +9,8 @@ import { parseVatSlot } from './parseVatSlots.js';
 
 /**
  * @template V
-<<<<<<< HEAD
  * @template {any[]} [A=unknown[]]
  * @typedef {[watcher: import('./types.js').PromiseWatcher<V, A>, ...args: A]} PromiseWatcherTuple
-=======
- * @typedef {[watcher: import('./types.js').PromiseWatcher<V>, ...args: unknown[]]} PromiseWatcherTuple
->>>>>>> 5be9ad245 (chore(types): PromiseWatcher)
  */
 
 /**