test: cached fetch

Author: turadg

.gitignore

@@ -36,6 +36,9 @@ typings/
 # Optional eslint cache
 .eslintcache
 
+# General cache (e.g. by node-fetch-cache
+.cache
+
 # Optional REPL history
 .node_repl_history
 

packages/boot/package.json

@@ -20,7 +20,6 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@endo/errors": "^1.2.9",
     "@agoric/builders": "^0.1.0",
     "@agoric/client-utils": "^0.1.0",
     "@agoric/cosmic-proto": "^0.4.0",
@@ -45,6 +44,7 @@
     "@agoric/zone": "^0.2.2",
     "@endo/bundle-source": "^3.5.1",
     "@endo/captp": "^4.4.4",
+    "@endo/errors": "^1.2.9",
     "@endo/eventual-send": "^1.3.0",
     "@endo/far": "^1.1.10",
     "@endo/init": "^1.1.8",
@@ -62,6 +62,7 @@
     "@endo/patterns": "^1.4.8",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
+    "node-fetch-cache": "^4.1.2",
     "ts-blank-space": "^0.4.4"
   },
   "files": [

packages/boot/test/fast-usdc/fast-usdc.test.ts

@@ -16,8 +16,7 @@ import type { EndoZipBase64Bundle } from '@agoric/swingset-vat';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { Fail } from '@endo/errors';
 import { makeMarshal } from '@endo/marshal';
-import { readFile } from 'node:fs/promises';
-import { createRequire } from 'node:module';
+import NodeFetchCache, { FileSystemCache } from 'node-fetch-cache';
 import {
   AckBehavior,
   insistManagerType,
@@ -28,7 +27,12 @@ import {
   type WalletFactoryTestContext,
 } from '../bootstrapTests/walletFactory.js';
 
-const nodeRequire = createRequire(import.meta.url);
+// Releases are immutable, so we can cache them.
+// Doesn't help in CI but speeds up local development.
+// CI is on Github Actions, so fetching is reliable.
+const fetchCached = NodeFetchCache.create({
+  cache: new FileSystemCache(),
+}) as unknown as typeof globalThis.fetch;
 
 const test: TestFn<
   WalletFactoryTestContext & {
@@ -70,7 +74,7 @@ test.serial('oracles provision before contract deployment', async t => {
 });
 
 const downloadCoreEval = async (
-  { fetch = globalThis.fetch } = {},
+  { fetch }: { fetch: typeof globalThis.fetch },
   config = {
     repo: 'Agoric/agoric-sdk',
     release: 'fast-usdc-beta-1',
@@ -111,18 +115,8 @@ const downloadCoreEval = async (
 test.serial('prop 87: Beta', async t => {
   const { evalProposal, bridgeUtils } = t.context;
 
-  const fetchFixture = async url => {
-    const basename = url.split('/').at(-1);
-    const cachePath = nodeRequire.resolve(`./bundles/${basename}`);
-    t.log('load', url, 'from', cachePath);
-    const txt = await readFile(cachePath, 'utf-8');
-    return {
-      text: async () => txt,
-      json: async () => JSON.parse(txt),
-    };
-  };
   const materials = await downloadCoreEval({
-    fetch: fetchFixture as unknown as typeof fetch,
+    fetch: fetchCached,
   });
 
   // Proposal 87 doesn't quite complete: noble ICA is mis-configured

yarn.lock

@@ -3608,6 +3608,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/[email protected]":
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24"
+  integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==
+  dependencies:
+    "@types/node" "*"
+    form-data "^4.0.0"
+
 "@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.9.0":
   version "22.9.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365"
@@ -4623,6 +4631,24 @@ cacache@^17.0.0:
     tar "^6.1.11"
     unique-filename "^3.0.0"
 
+cacache@^18.0.1:
+  version "18.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5"
+  integrity sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^10.2.2"
+    lru-cache "^10.0.1"
+    minipass "^7.0.3"
+    minipass-collect "^2.0.1"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
+
 call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840"
@@ -8370,6 +8396,11 @@ locate-path@^7.1.0:
   dependencies:
     p-locate "^6.0.0"
 
+locko@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/locko/-/locko-1.1.0.tgz#43930d87a0d25f20c8d2974c3c4613e50a2978a9"
+  integrity sha512-pYB2dzRY93fJkg2RIl41AMNgTQftEjyTK9vlPrGOJvuGQsOjb267VJBw15BjiN3RBd1oBoKkOu9E2dRdFKIfAA==
+
 [email protected], lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -8440,7 +8471,7 @@ long@*, long@^5.0.0, long@^5.2.0, long@^5.2.1:
   resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
   integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
 
-lru-cache@^10.2.0:
+lru-cache@^10.0.1, lru-cache@^10.2.0:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
@@ -9060,6 +9091,13 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
+minipass-collect@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
+  integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==
+  dependencies:
+    minipass "^7.0.3"
+
 minipass-fetch@^2.0.3:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
@@ -9300,7 +9338,18 @@ node-addon-api@^5.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501"
   integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==
 
-node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7, node-fetch@^2.6.9, node-fetch@^2.7.0:
+node-fetch-cache@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-cache/-/node-fetch-cache-4.1.2.tgz#4fdbd152c80ec5de76749076a1c4bb16510af8ee"
+  integrity sha512-pcdJlxXE/fT0wcCY13RJUAyZeMKW4altG7P1GKLn1d4z1nLzM9Ua0ZIBiZUp90ppI/UqenZ+8UKWq+cKBk1fFA==
+  dependencies:
+    "@types/node-fetch" "2.6.11"
+    cacache "^18.0.1"
+    form-data "^4.0.0"
+    locko "^1.1.0"
+    node-fetch "2.7.0"
+
+[email protected], node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7, node-fetch@^2.6.9, node-fetch@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==