Skip to content

Commit

Permalink
Merge pull request #1182 from Agoric/ta/sdk-compat
Browse files Browse the repository at this point in the history
SDK CI compat
  • Loading branch information
turadg authored Aug 22, 2024
2 parents 8fa8208 + 7960a64 commit 584577f
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 400 deletions.
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,25 @@
"dependencies": {
"@agoric/ertp": "community-dev",
"@agoric/zoe": "community-dev",
"@agoric/zone": "0.2.3-u13.0",
"@endo/far": "^0.2.19",
"@endo/marshal": "^0.8.6",
"@endo/pass-style": "^0.1.6",
"@endo/patterns": "^0.2.3",
"@agoric/zone": "community-dev",
"@endo/errors": "^1.2.4",
"@endo/far": "^1.1.4",
"@endo/marshal": "^1.5.2",
"@endo/pass-style": "^1.4.2",
"@endo/patterns": "^1.4.2",
"typescript": "^4.0.3"
},
"devDependencies": {
"@agoric/assert": "community-dev",
"@agoric/cosmic-swingset": "community-dev",
"@agoric/ertp": "community-dev",
"@agoric/notifier": "community-dev",
"@agoric/solo": "community-dev",
"@agoric/store": "community-dev",
"@agoric/vats": "community-dev",
"@endo/bundle-source": "2.5.2-upstream-rollup",
"@endo/eventual-send": "^0.17.2",
"@endo/init": "^0.5.56",
"@endo/promise-kit": "^0.2.56",
"@endo/bundle-source": "^3.3.0",
"@endo/eventual-send": "^1.2.4",
"@endo/init": "^1.1.3",
"@endo/promise-kit": "^1.1.4",
"@endo/ses-ava": "^1.2.4",
"@typescript-eslint/parser": "^4.26.0",
"ava": "^4.3.1",
Expand All @@ -68,7 +68,7 @@
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-prettier": "^5.2.1",
"import-meta-resolve": "^1.1.1",
"import-meta-resolve": "^2.2.1",
"prettier": "^3.3.3",
"ses": "^1.7.0",
"stylus": "^0.62.0",
Expand Down
2 changes: 1 addition & 1 deletion snippets/tools/zoeTestHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { E } from '@endo/eventual-send';

import { AmountMath, assertValueGetHelpers } from '@agoric/ertp';

import { q } from '@agoric/assert';
import { q } from '@endo/errors';

export const assertAmountsEqual = (t, amount, expected, label = '') => {
harden(amount);
Expand Down
4 changes: 2 additions & 2 deletions snippets/zoe/contracts/test-oracle.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { makeFakeVatAdmin } from '@agoric/zoe/tools/fakeVatAdmin.js';
import { makeZoeKit } from '@agoric/zoe';
import bundleSource from '@endo/bundle-source';
import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
import { assert, details } from '@agoric/assert';
import { assert, redacted } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';

Expand Down Expand Up @@ -43,7 +43,7 @@ test('oracle contract', async t => {
requiredFee = feeAmount;
assert(
AmountMath.isGTE(fee, requiredFee),
details`Minimum fee of ${feeAmount} not met; have ${fee}`,
redacted`Minimum fee of ${feeAmount} not met; have ${fee}`,
);
}
return harden({ reply, requiredFee });
Expand Down
Loading

0 comments on commit 584577f

Please sign in to comment.