-
Notifications
You must be signed in to change notification settings - Fork 214
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into muneeb/capture-gh-ci-stats
- Loading branch information
Showing
50 changed files
with
3,093 additions
and
948 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 0 additions & 102 deletions
102
a3p-integration/proposals/n:upgrade-next/provisionPool.test.js
This file was deleted.
Oops, something went wrong.
41 changes: 0 additions & 41 deletions
41
a3p-integration/proposals/n:upgrade-next/resetChargingPeriod.js
This file was deleted.
Oops, something went wrong.
62 changes: 62 additions & 0 deletions
62
a3p-integration/proposals/n:upgrade-next/test-lib/price-feed.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* eslint-env node */ | ||
|
|
||
| import { | ||
| agoric, | ||
| getContractInfo, | ||
| pushPrices, | ||
| getPriceQuote, | ||
| } from '@agoric/synthetic-chain'; | ||
| import { retryUntilCondition } from './sync-tools.js'; | ||
|
|
||
| export const scale6 = x => BigInt(x * 1_000_000); | ||
|
|
||
| /** | ||
| * | ||
| * @param {number} price | ||
| * @param {string} brand | ||
| * @param {Map<any, any>} oraclesByBrand | ||
| * @param {number} roundId | ||
| * @returns {Promise<void>} | ||
| */ | ||
| export const verifyPushedPrice = async ( | ||
| price, | ||
| brand, | ||
| oraclesByBrand, | ||
| roundId, | ||
| ) => { | ||
| const pushPriceRetryOpts = { | ||
| maxRetries: 5, // arbitrary | ||
| retryIntervalMs: 5000, // in ms | ||
| }; | ||
|
|
||
| await pushPrices(price, brand, oraclesByBrand, roundId); | ||
| console.log(`Pushing price ${price} for ${brand}`); | ||
|
|
||
| await retryUntilCondition( | ||
| () => getPriceQuote(brand), | ||
| res => res === `+${scale6(price).toString()}`, | ||
| 'price not pushed yet', | ||
| { | ||
| log: console.log, | ||
| setTimeout: global.setTimeout, | ||
| ...pushPriceRetryOpts, | ||
| }, | ||
| ); | ||
| console.log(`Price ${price} pushed for ${brand}`); | ||
| }; | ||
|
|
||
| /** | ||
| * | ||
| * @param {string} brand | ||
| * @returns {Promise<number>} | ||
| */ | ||
| export const getPriceFeedRoundId = async brand => { | ||
| const latestRoundPath = `published.priceFeed.${brand}-USD_price_feed.latestRound`; | ||
| const latestRound = await getContractInfo(latestRoundPath, { | ||
| agoric, | ||
| prefix: '', | ||
| }); | ||
|
|
||
| console.log('latestRound: ', latestRound); | ||
| return Number(latestRound.roundId); | ||
| }; |
72 changes: 72 additions & 0 deletions
72
a3p-integration/proposals/n:upgrade-next/test-lib/sync-tools.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* eslint-env node */ | ||
|
|
||
| /** | ||
| * @file These tools mostly duplicate code that will be added in other PRs | ||
| * and eventually migrated to synthetic-chain. Sorry for the duplication. | ||
| */ | ||
|
|
||
| /** | ||
| * @typedef {object} RetryOptions | ||
| * @property {number} [maxRetries] | ||
| * @property {number} [retryIntervalMs] | ||
| * @property {(...arg0: string[]) => void} log | ||
| * @property {(object) => void} [setTimeout] | ||
| * @property {string} [errorMessage=Error] | ||
| */ | ||
|
|
||
| const ambientSetTimeout = global.setTimeout; | ||
|
|
||
| /** | ||
| * From https://github.com/Agoric/agoric-sdk/blob/442f07c8f0af03281b52b90e90c27131eef6f331/multichain-testing/tools/sleep.ts#L10 | ||
| * | ||
| * @param {number} ms | ||
| * @param {*} sleepOptions | ||
| */ | ||
| const sleep = (ms, { log = () => {}, setTimeout = ambientSetTimeout }) => | ||
| new Promise(resolve => { | ||
| log(`Sleeping for ${ms}ms...`); | ||
| setTimeout(resolve, ms); | ||
| }); | ||
|
|
||
| /** | ||
| * From https://github.com/Agoric/agoric-sdk/blob/442f07c8f0af03281b52b90e90c27131eef6f331/multichain-testing/tools/sleep.ts#L24 | ||
| * | ||
| * @param {() => Promise} operation | ||
| * @param {(result: any) => boolean} condition | ||
| * @param {string} message | ||
| * @param {RetryOptions} options | ||
| */ | ||
| export const retryUntilCondition = async ( | ||
| operation, | ||
| condition, | ||
| message, | ||
| { maxRetries = 6, retryIntervalMs = 3500, log, setTimeout }, | ||
| ) => { | ||
| console.log({ maxRetries, retryIntervalMs, message }); | ||
| let retries = 0; | ||
|
|
||
| await null; | ||
| while (retries < maxRetries) { | ||
| try { | ||
| const result = await operation(); | ||
| log('RESULT', result); | ||
| if (condition(result)) { | ||
| return result; | ||
| } | ||
| } catch (error) { | ||
| if (error instanceof Error) { | ||
| log(`Error: ${error.message}`); | ||
| } else { | ||
| log(`Unknown error: ${String(error)}`); | ||
| } | ||
| } | ||
|
|
||
| retries += 1; | ||
| console.log( | ||
| `Retry ${retries}/${maxRetries} - Waiting for ${retryIntervalMs}ms for ${message}...`, | ||
| ); | ||
| await sleep(retryIntervalMs, { log, setTimeout }); | ||
| } | ||
|
|
||
| throw Error(`${message} condition failed after ${maxRetries} retries.`); | ||
| }; |
Oops, something went wrong.