synchronous makeVstorageKit

a3p-integration/proposals/s:stake-bld/test-lib/index.js

@@ -1,7 +1,7 @@
 /* eslint-env node */
 import { execFileSync } from 'child_process';
 import { LOCAL_CONFIG as networkConfig } from '@agoric/client-utils';
-import { makeWalletUtils } from './wallet.js';
+import { makeAgdWalletUtils } from './wallet.js';
 
 export { networkConfig };
 
@@ -13,7 +13,7 @@ export { networkConfig };
  */
 const delay = ms => new Promise(resolve => setTimeout(() => resolve(), ms));
 
-export const walletUtils = await makeWalletUtils(
+export const walletUtils = await makeAgdWalletUtils(
   { execFileSync, delay, fetch },
   networkConfig,
 );

a3p-integration/proposals/s:stake-bld/test-lib/wallet.js

@@ -4,11 +4,20 @@ import { makeVstorageKit } from '@agoric/client-utils';
 import { sendAction } from 'agoric/src/lib/index.js';
 import { inspect } from 'util';
 
-export const makeWalletUtils = async (
+/**
+ * Stop-gap using execFileSync until we have a pure JS signing client.
+ *
+ * @param {object} root0
+ * @param {import('child_process')['execFileSync']} root0.execFileSync
+ * @param {typeof globalThis.fetch} root0.fetch
+ * @param {any} root0.delay
+ * @param {import('@agoric/client-utils').MinimalNetworkConfig} networkConfig
+ */
+export const makeAgdWalletUtils = async (
   { delay, execFileSync, fetch },
   networkConfig,
 ) => {
-  const { agoricNames, fromBoard, marshaller, readLatestHead, vstorage } =
+  const { agoricNames, fromBoard, readLatestHead, vstorage } =
     await makeVstorageKit({ fetch }, networkConfig);
 
   /**
@@ -23,7 +32,6 @@ export const makeWalletUtils = async (
       delay,
       execFileSync,
       from,
-      marshaller,
       keyring: { backend: 'test' },
     });
   };

a3p-integration/proposals/z:acceptance/psm.test.js

@@ -21,7 +21,7 @@ import {
 } from '@agoric/synthetic-chain';
 import { waitUntilAccountFunded } from '@agoric/client-utils';
 import test from 'ava';
-import { NonNullish } from './test-lib/errors.js';
+import { NonNullish } from '@agoric/internal/src/errors.js';
 import {
   adjustBalancesIfNotProvisioned,
   bankSend,

a3p-integration/proposals/z:acceptance/test-lib/index.js

@@ -1,12 +1,9 @@
 /* eslint-env node */
-import { makeWalletUtils } from '@agoric/client-utils';
+import { makeWalletUtils, LOCAL_CONFIG } from '@agoric/client-utils';
 import { execFileSync } from 'child_process';
 import { makeAgdWalletUtils } from './wallet.js';
 
-export const networkConfig = {
-  rpcAddrs: ['http://0.0.0.0:26657'],
-  chainName: 'agoriclocal',
-};
+export const networkConfig = LOCAL_CONFIG;
 
 /**
  * Resolve after a delay in milliseconds.
@@ -22,6 +19,6 @@ export const walletUtils = await makeWalletUtils(
 );
 
 export const agdWalletUtils = await makeAgdWalletUtils(
-  { execFileSync, setTimeout, walletUtils },
+  { execFileSync, delay, fetch },
   networkConfig,
 );

a3p-integration/proposals/z:acceptance/test-lib/kread.js

@@ -1,4 +1,5 @@
 // @ts-nocheck FIXME
+// XXX uses agoric.follow to read data through spawned processes; replace with VstorageKit
 import assert from 'node:assert';
 
 import {

a3p-integration/proposals/z:acceptance/test-lib/psm-lib.js

@@ -26,7 +26,7 @@ import {
   VALIDATORADDR,
 } from '@agoric/synthetic-chain';
 import fsp from 'node:fs/promises';
-import { NonNullish } from './errors.js';
+import { NonNullish } from '@agoric/internal/src/errors.js';
 import { getBalances } from './utils.js';
 
 /** @import {Result as ExecaResult, ExecaError} from 'execa'; */