fix: clean up E.when and E.resolve (#1561)

* fix: clean up E.when and E.resolve

packages/ERTP/src/issuer.js

@@ -4,6 +4,7 @@
 
 import { assert, details } from '@agoric/assert';
 import makeStore from '@agoric/weak-store';
+import { E } from '@agoric/eventual-send';
 import { isPromise } from '@agoric/promise-kit';
 
 import { makeAmountMath, MathKind } from './amountMath';
@@ -20,7 +21,7 @@ function makeIssuerKit(allegedName, amountMathKind = MathKind.NAT) {
 
   const brand = harden({
     isMyIssuer: allegedIssuerP => {
-      return Promise.resolve(allegedIssuerP).then(allegedIssuer => {
+      return E.when(allegedIssuerP, allegedIssuer => {
         // eslint-disable-next-line no-use-before-define
         return allegedIssuer === issuer;
       });
@@ -185,19 +186,19 @@ function makeIssuerKit(allegedName, amountMathKind = MathKind.NAT) {
     },
 
     isLive: paymentP => {
-      return Promise.resolve(paymentP).then(payment => {
+      return E.when(paymentP, payment => {
         return paymentLedger.has(payment);
       });
     },
     getAmountOf: paymentP => {
-      return Promise.resolve(paymentP).then(payment => {
+      return E.when(paymentP, payment => {
         assertKnownPayment(payment);
         return paymentLedger.get(payment);
       });
     },
 
     burn: (paymentP, optAmount = undefined) => {
-      return Promise.resolve(paymentP).then(payment => {
+      return E.when(paymentP, payment => {
         assertKnownPayment(payment);
         const paymentBalance = paymentLedger.get(payment);
         assertAmountEqual(paymentBalance, optAmount);
@@ -207,7 +208,7 @@ function makeIssuerKit(allegedName, amountMathKind = MathKind.NAT) {
       });
     },
     claim: (paymentP, optAmount = undefined) => {
-      return Promise.resolve(paymentP).then(srcPayment => {
+      return E.when(paymentP, srcPayment => {
         assertKnownPayment(srcPayment);
         const srcPaymentBalance = paymentLedger.get(srcPayment);
         assertAmountEqual(srcPaymentBalance, optAmount);
@@ -242,7 +243,7 @@ function makeIssuerKit(allegedName, amountMathKind = MathKind.NAT) {
     },
     // payment to two payments, A and B
     split: (paymentP, paymentAmountA) => {
-      return Promise.resolve(paymentP).then(srcPayment => {
+      return E.when(paymentP, srcPayment => {
         paymentAmountA = amountMath.coerce(paymentAmountA);
         assertKnownPayment(srcPayment);
         const srcPaymentBalance = paymentLedger.get(srcPayment);
@@ -261,7 +262,7 @@ function makeIssuerKit(allegedName, amountMathKind = MathKind.NAT) {
       });
     },
     splitMany: (paymentP, amounts) => {
-      return Promise.resolve(paymentP).then(srcPayment => {
+      return E.when(paymentP, srcPayment => {
         assertKnownPayment(srcPayment);
         amounts = amounts.map(amountMath.coerce);
         // Commit point

packages/cosmic-swingset/lib/ag-solo/vats/ibc.js

@@ -220,7 +220,7 @@ export function makeIBCProtocolHandler(E, callIBCDevice) {
           localAddr,
           remoteAddr,
         );
-        const connP = E.when(conn);
+        const connP = E.resolve(conn);
         channelKeyToConnP.init(channelKey, connP);
       },
       onReceive,

packages/eventual-send/src/E.js

@@ -3,7 +3,7 @@
 // eslint-disable-next-line spaced-comment
 /// <reference path="index.d.ts" />
 
-const readOnlyProxy = {
+const readOnlyProxyHandler = {
   set(_target, _prop, _value) {
     return false;
   },
@@ -26,7 +26,7 @@ const readOnlyProxy = {
  */
 function EProxyHandler(x, HandledPromise) {
   return harden({
-    ...readOnlyProxy,
+    ...readOnlyProxyHandler,
     get(_target, p, _receiver) {
       if (`${p}` !== p) {
         return undefined;
@@ -56,7 +56,7 @@ export default function makeE(HandledPromise) {
 
   const makeEGetterProxy = x =>
     new Proxy(Object.create(null), {
-      ...readOnlyProxy,
+      ...readOnlyProxyHandler,
       has(_target, _prop) {
         return true;
       },

packages/eventual-send/src/index.d.ts

@@ -93,9 +93,10 @@ interface EProxy {
   readonly G<T>(x: T): ESingleGet<Unpromise<T>>;
 
   /**
-   * E.when(x) converts x to a promise.
+   * E.resolve(x) converts x to a handled promise. It is
+   * shorthand for HandledPromise.resolve(x)
    */
-  readonly when<T>(x: T): Promise<Unpromise<T>>;
+  readonly resolve<T>(x: T): Promise<Unpromise<T>>;
 
   /**
    * E.when(x, res, rej) is equivalent to

packages/marshal/marshal.js

@@ -30,7 +30,8 @@ const remotableToInterface = new WeakMap();
  * Simple semantics, just tell what interface (or undefined) a remotable has.
  *
  * @param {*} maybeRemotable the value to check
- * @returns {InterfaceSpec|undefined} the interface specification, or undefined if not a Remotable
+ * @returns {InterfaceSpec|undefined} the interface specification, or undefined
+ * if not a Remotable
  */
 export function getInterfaceOf(maybeRemotable) {
   return remotableToInterface.get(maybeRemotable);

packages/notifier/src/asyncIterableAdaptor.js

@@ -107,7 +107,8 @@ export const updateFromIterable = (updater, asyncIterable) => {
   const iterator = asyncIterable[Symbol.asyncIterator]();
   return new Promise(ack => {
     const recur = () => {
-      E.when(iterator.next()).then(
+      E.when(
+        iterator.next(),
         ({ value, done }) => {
           if (done) {
             updater.finish && updater.finish(value);

packages/notifier/test/test-notifier-adaptor.js

@@ -1,5 +1,6 @@
 // @ts-check
 import '@agoric/install-ses';
+import { E } from '@agoric/eventual-send';
 import test from 'tape-promise/tape';
 import {
   makeAsyncIterableFromNotifier,
@@ -42,7 +43,8 @@ const finiteStream = makeIterable(false);
 const explodingStream = makeIterable(true);
 
 const testEnding = (t, p, fails) => {
-  return Promise.resolve(p).then(
+  return E.when(
+    p,
     result => {
       t.equal(fails, false);
       t.equal(result, refResult);
@@ -71,18 +73,18 @@ const testManualConsumer = (t, iterable, lossy) => {
   const testLoop = i => {
     return iterator.next().then(
       ({ value, done }) => {
+        i = skip(i, value, lossy);
         if (done) {
           t.equal(i, payloads.length);
           return value;
         }
-        i = skip(i, value, lossy);
         t.assert(i < payloads.length);
         // Need precise equality
         t.assert(Object.is(value, payloads[i]));
         return testLoop(i + 1);
       },
       reason => {
-        t.equal(i, payloads.length);
+        t.assert(i <= payloads.length);
         throw reason;
       },
     );
@@ -101,7 +103,7 @@ const testAutoConsumer = async (t, iterable, lossy) => {
       i += 1;
     }
   } finally {
-    t.equal(i, payloads.length);
+    t.assert(i <= payloads.length);
   }
   // The for-await-of loop cannot observe the final value of the iterator
   // so this consumer cannot test what that was. Just return what testEnding