Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing #118

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions loadgen/contract/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@agoric/ertp": "*",
"@agoric/notifier": "*",
"@agoric/zoe": "*",
"@endo/eventual-send": "^0.16.9",
"@endo/far": "^0.2.15"
"@endo/eventual-send": "^1.2.7",
"@endo/far": "^1.1.7"
},
"keywords": [],
"author": "Agoric",
Expand Down
8 changes: 4 additions & 4 deletions loadgen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"dependencies": {
"@agoric/deploy-script-support": "*",
"@endo/init": "^0.5.53",
"@endo/promise-kit": "^0.2.53",
"@endo/eventual-send": "^0.16.9",
"esm": "agoric-labs/esm#Agoric-built",
"@endo/init": "^1.1.6",
"@endo/promise-kit": "^1.1.7",
"@endo/eventual-send": "^1.2.7",
"esm": "https://github.com/agoric-labs/esm#Agoric-built",
"firebase": "^9.0.2"
},
"author": "Agoric",
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"version": "0.0.1",
"private": true,
"useWorkspaces": true,
"main": "index.js",
"workspaces": [
"_agstate/agoric-servers",
"loadgen",
Expand All @@ -22,18 +21,17 @@
"eslint-config-jessie": "^0.0.6",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsdoc": "^39.3.3",
"eslint-plugin-jsdoc": "^43.0.8",
"eslint-plugin-prettier": "^3.4.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"typescript": "~4.7.4"
},
"resolutions": {
"@protobufjs/inquire": "./protobufjs-inquire",
"esm": "agoric-labs/esm#Agoric-built"
"esm": "https://github.com/agoric-labs/esm#Agoric-built"
},
"scripts": {
"preinstall": "node -e \"process.env.AGORIC_INSTALL && process.exit(0); console.warn('please use: agoric install . For details, see https://agoric.com/documentation/'); process.exit(1)\"",
"lint": "run-s --continue-on-error lint:*",
"lint:format": "yarn prettier --check .",
"lint:packages": "yarn workspaces run lint",
Expand All @@ -57,5 +55,6 @@
"prettier": {
"trailingComma": "all",
"singleQuote": true
}
},
"packageManager": "yarn@1.22.5"
}
1 change: 0 additions & 1 deletion runner/lib/entrypoint.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ process.on('uncaughtException', (error) => {
res === undefined || process.exit(res);
},
(rej) => {
// console.log(process._getActiveRequests(), process._getActiveHandles());
console.error(rej);
if (rej.errors) {
flattenAggregateErrors(rej.errors).forEach((error) =>
Expand Down
2 changes: 1 addition & 1 deletion runner/lib/helpers/time.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ export const makeTimeSource = ({
return { timeOrigin, getTime, now, shift };
};

/** @typedef {ReturnType<makeTimeSource>} TimeSource */
/** @typedef {ReturnType<typeof makeTimeSource>} TimeSource */
23 changes: 15 additions & 8 deletions runner/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,15 @@ const makeInterrupterKit = ({ console }) => {
const getSDKBinaries = async () => {
const srcHelpers = 'agoric/src/helpers.js';
const libHelpers = 'agoric/lib/helpers.js';

/**
* @type {import('./tasks/types.js').SDKBinaries}
*/
let binaryPaths;

try {
const cliHelpers = await import(srcHelpers).catch(() => import(libHelpers));
return cliHelpers.getSDKBinaries();
binaryPaths = cliHelpers.getSDKBinaries();
} catch (err) {
// Older SDKs were only at lib
const cliHelpersUrl = await importMetaResolve(libHelpers, import.meta.url);
Expand All @@ -181,19 +187,20 @@ const getSDKBinaries = async () => {
) {
agSolo = agSolo.replace(/\.cjs$/, '.js');
}
return {
binaryPaths = {
agSolo,
cosmosChain: new URL(
'../../cosmic-swingset/bin/ag-chain-cosmos',
cliHelpersUrl,
).pathname,
cosmosChain: '',
cosmosHelper: new URL(
// The older SDKs without getSDKBinaries hadn't renamed to agd yet
'../../../golang/cosmos/build/ag-cosmos-helper',
cliHelpersUrl,
).pathname,
};
}

binaryPaths = {...binaryPaths, cosmosChain: 'ag-chain-cosmos'};

return binaryPaths;
};

/**
Expand All @@ -218,6 +225,7 @@ const main = async (progName, rawArgs, powers) => {
'duplicate-arguments-array': false,
'flatten-duplicate-arrays': false,
'greedy-arrays': true,
'strip-dashed': true,
},
});

Expand Down Expand Up @@ -573,7 +581,6 @@ const main = async (progName, rawArgs, powers) => {
};

const chainMonitor =
/** @type {undefined | true} */ (undefined) &&
runChainResult.processInfo &&
makeChainMonitor(
{
Expand Down Expand Up @@ -984,7 +991,7 @@ const main = async (progName, rawArgs, powers) => {
// This will throw if there was any interrupt, and prevent further execution
async () => releaseInterrupt(),
));
logPerfEvent('setup-tasks-finish');
return logPerfEvent('setup-tasks-finish');
}

const stages =
Expand Down
Loading
Loading