chore(a3p-integration): Improve n:upgrade-next log output

Agoric · Nov 16, 2024 · ebec543 · ebec543
1 parent 0372937
commit ebec543
Show file tree

Hide file tree

Showing 6 changed files with 3,458 additions and 202 deletions.
diff --git a/a3p-integration/proposals/n:upgrade-next/package.json b/a3p-integration/proposals/n:upgrade-next/package.json
@@ -11,6 +11,7 @@
   "type": "module",
   "license": "Apache-2.0",
   "dependencies": {
+    "@agoric/client-utils": "dev",
     "@agoric/synthetic-chain": "^0.3.0",
     "@endo/init": "^1.1.6",
     "@endo/marshal": "^1.6.1",
@@ -26,10 +27,16 @@
     ]
   },
   "scripts": {
-    "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
+    "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops",
+    "lint-fix": "yarn lint:eslint --fix",
+    "lint": "run-s --continue-on-error 'lint:*'",
+    "lint:types": "tsc",
+    "lint:eslint": "eslint ."
   },
   "packageManager": "yarn@4.5.1",
   "devDependencies": {
+    "eslint": "^8.57.0",
+    "npm-run-all": "^4.1.5",
     "typescript": "^5.6.3"
   }
 }
diff --git a/a3p-integration/proposals/n:upgrade-next/synthetic-chain-excerpt.js b/a3p-integration/proposals/n:upgrade-next/synthetic-chain-excerpt.js
@@ -32,22 +32,20 @@ const waitForBootstrap = async () => {
   }
 };
 
-export const waitForBlock = async (times = 1) => {
-  console.log(times);
-  let time = 0;
-  while (time < times) {
-    const block1 = await waitForBootstrap();
+export const waitForBlock = async (n = 1) => {
+  console.log(`waitForBlock waiting for ${n} new block(s)...`);
+  const h0 = await waitForBootstrap();
+  let lastHeight = h0;
+  for (let i = 0; i < n; i += 1) {
     while (true) {
-      const block2 = await waitForBootstrap();
-
-      if (block1 !== block2) {
-        console.log('block produced');
+      await new Promise(r => setTimeout(r, 1000));
+      const currentHeight = await waitForBootstrap();
+      if (currentHeight !== lastHeight) {
+        console.log(`waitForBlock saw new height ${currentHeight}`);
+        lastHeight = currentHeight;
         break;
       }
-
-      await new Promise(r => setTimeout(r, 1000));
     }
-    time += 1;
   }
 };
 

diff --git a/a3p-integration/proposals/n:upgrade-next/test-lib/price-feed.js b/a3p-integration/proposals/n:upgrade-next/test-lib/price-feed.js
@@ -6,7 +6,7 @@ import {
   pushPrices,
   getPriceQuote,
 } from '@agoric/synthetic-chain';
-import { retryUntilCondition } from './sync-tools.js';
+import { retryUntilCondition } from '@agoric/client-utils';
 
 export const scale6 = x => BigInt(x * 1_000_000);
 
@@ -57,6 +57,6 @@ export const getPriceFeedRoundId = async brand => {
     prefix: '',
   });
 
-  console.log('latestRound: ', latestRound);
+  console.log(latestRoundPath, latestRound);
   return Number(latestRound.roundId);
 };
diff --git a/a3p-integration/proposals/n:upgrade-next/test-lib/sync-tools.js b/a3p-integration/proposals/n:upgrade-next/test-lib/sync-tools.js