fix: access when and makeWhenableKit correctly

packages/network/src/network.js

@@ -1,7 +1,6 @@
 import { E } from '@endo/far';
 import { Fail } from '@agoric/assert';
 import { whileTrue } from '@agoric/internal';
-import { when } from '@agoric/whenable';
 import { toBytes } from './bytes.js';
 
 import '@agoric/store/exported.js';
@@ -47,7 +46,7 @@ export function getPrefixes(addr) {
  * @param {import('@agoric/base-zone').Zone} zone
  * @param {ReturnType<import('@agoric/whenable').prepareWhenableModule>} powers
  */
-const prepareHalfConnection = (zone, { watch }) => {
+const prepareHalfConnection = (zone, { when }) => {
  const makeHalfConnection = zone.exoClass(
  'Connection',
  undefined,
@@ -414,6 +413,7 @@ const prepareBinder = (zone, powers) => {
  const makeInboundAttempt = prepareInboundAttempt(zone, makeConnection);
  const makePort = preparePort(zone);
  const detached = zone.detached();
+ const { when } = powers;
 
  const makeBinderKit = zone.exoClassKit(
  'binder',

packages/network/test/test-network-misc.js

@@ -3,9 +3,8 @@
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
 
-import { makePromiseKit } from '@endo/promise-kit';
-import { E, Far } from '@endo/far';
-import { prepareWhenableModule, when } from '@agoric/whenable';
+import { E } from '@endo/far';
+import { prepareWhenableModule } from '@agoric/whenable';
 import { makeDurableZone } from '@agoric/zone/durable.js';
 
 import {
@@ -15,6 +14,7 @@ import {
  makeNetworkProtocol,
  prepareRouter,
  prepareLoopbackProtocolHandler,
+ prepareNonceMaker,
 } from '../src/index.js';
 
 import '../src/types.js';
@@ -105,9 +105,10 @@ const provideBaggage = key => {
 
 test('handled protocol', async t => {
  const zone = makeDurableZone(provideBaggage('network-handled-protocol'));
+ const powers = prepareWhenableModule(zone);
+ const { makeWhenableKit, when } = powers;
  const makeProtocolHandler = prepareProtocolHandler(zone, t);
- const protocol = makeNetworkProtocol(zone, makeProtocolHandler());
- const { makeWhenableKit } = prepareWhenableModule(zone);
+ const protocol = makeNetworkProtocol(zone, makeProtocolHandler(), powers);
 
  const port = await when(protocol.bind('/ibc/*/ordered'));
 
@@ -154,9 +155,10 @@ test('handled protocol', async t => {
 
 test('protocol connection listen', async t => {
  const zone = makeDurableZone(provideBaggage('network-protocol-connection'));
+ const powers = prepareWhenableModule(zone);
+ const { makeWhenableKit, when } = powers;
  const makeProtocolHandler = prepareProtocolHandler(zone, t);
- const protocol = makeNetworkProtocol(zone, makeProtocolHandler());
- const { makeWhenableKit } = prepareWhenableModule(zone);
+ const protocol = makeNetworkProtocol(zone, makeProtocolHandler(), powers);
 
  const port = await when(protocol.bind('/net/ordered/ordered/some-portname'));
  const { whenable, settler } = makeWhenableKit();
@@ -306,9 +308,18 @@ test('protocol connection listen', async t => {
 
 test('loopback protocol', async t => {
  const zone = makeDurableZone(provideBaggage('network-loopback-protocol'));
- const makeLoopbackProtocolHandler = prepareLoopbackProtocolHandler(zone);
- const protocol = makeNetworkProtocol(zone, makeLoopbackProtocolHandler());
- const { makeWhenableKit } = prepareWhenableModule(zone);
+ const powers = prepareWhenableModule(zone);
+ const { makeWhenableKit, when } = powers;
+ const makeNonceMaker = prepareNonceMaker(zone);
+ const makeLoopbackProtocolHandler = prepareLoopbackProtocolHandler(
+ zone,
+ makeNonceMaker,
+ );
+ const protocol = makeNetworkProtocol(
+ zone,
+ makeLoopbackProtocolHandler(),
+ powers,
+ );
  const { whenable, settler } = makeWhenableKit();
 
  const port = await when(protocol.bind('/loopback/foo'));

packages/vats/src/ibc.js

@@ -558,20 +558,6 @@ export const prepareIBCProtocol = (zone, { makeWhenableKit, watch, when }) => {
  const data = base64ToBytes(data64);
 
  watch(conn.send(data), makeAckWatcher(this.facets.util, packet));
-
- /*
- await E(conn)
- .send(data)
- .then(ack => {
- const realAck = ack || DEFAULT_ACKNOWLEDGEMENT;
- const ack64 = dataToBase64(realAck);
- this.facets.util.downcall('receiveExecuted', {
- packet,
- ack: ack64,
- });
- })
- .catch(e => console.error(e));
- */
  break;
  }
 

packages/vats/test/test-network.js

@@ -3,13 +3,12 @@ import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js'
 
 import { E, Far } from '@endo/far';
 import {
- makeSubscriptionKit,
  makePinnedHistoryTopic,
  prepareDurablePublishKit,
  subscribeEach,
 } from '@agoric/notifier';
 import { makeDurableZone } from '@agoric/zone/durable.js';
-import { makeWhenableKit, prepareWhenableModule } from '@agoric/whenable';
+import { prepareWhenableModule } from '@agoric/whenable';
 
 import { buildRootObject as ibcBuildRootObject } from '../src/vat-ibc.js';
 import { buildRootObject as networkBuildRootObject } from '../src/vat-network.js';
@@ -23,7 +22,7 @@ const provideBaggage = key => {
  return zone.mapStore(`${key} baggage`);
 };
 
-const preparePlusOneConnectionHandler = zone => {
+const preparePlusOneConnectionHandler = (zone, { makeWhenableKit }) => {
  const makePlusOneConnectionHandler = zone.exoClass(
  'plusOne',
  undefined,
@@ -80,7 +79,8 @@ Far('ibcListener', {}),
  const ibcVat = E(ibcBuildRootObject)(null, null, provideBaggage('ibc'));
  const baggage = provideBaggage('network - ibc');
  const zone = makeDurableZone(baggage);
- const { when } = prepareWhenableModule(zone);
+ const powers = prepareWhenableModule(zone);
+ const { when } = powers;
 
  const makeDurablePublishKit = prepareDurablePublishKit(
  baggage,
@@ -116,7 +116,7 @@ Far('ibcListener', {}),
  t.assert(!ev1.done);
  t.deepEqual(ev1.value, ['bindPort', { packet: { source_port: 'port-1' } }]);
 
- const makePlusOne = preparePlusOneConnectionHandler(zone);
+ const makePlusOne = preparePlusOneConnectionHandler(zone, powers);
  const makeIBCListener = prepareIBCListener(zone, makePlusOne);
 
  const testEcho = async () => {