refactor: remove import @agoric/harden from miscellaneous sources

Agoric · Jun 30, 2020 · d6cf911 · d6cf911
1 parent dead67a
commit d6cf911
Show file tree

Hide file tree

Showing 84 changed files with 130 additions and 96 deletions.
diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
@@ -36,7 +36,6 @@
   "dependencies": {
     "@agoric/assert": "^0.0.7",
     "@agoric/eventual-send": "^0.9.2",
-    "@agoric/harden": "^0.0.8",
     "@agoric/import-manager": "^0.0.6",
     "@agoric/layer-cake": "^0.0.1",
     "@agoric/marshal": "^0.2.2",

diff --git a/packages/ERTP/src/amountMath.js b/packages/ERTP/src/amountMath.js
@@ -1,5 +1,6 @@
+/* global harden */
 // @ts-check
-import harden from '@agoric/harden';
+
 import { assert, details } from '@agoric/assert';
 
 import { mustBeComparable } from '@agoric/same-structure';

diff --git a/packages/ERTP/src/issuer.js b/packages/ERTP/src/issuer.js
@@ -1,7 +1,8 @@
 // Copyright (C) 2019 Agoric, under Apache License 2.0
+
+/* global harden */
 // @ts-check
 
-import harden from '@agoric/harden';
 import { assert, details } from '@agoric/assert';
 import makeStore from '@agoric/weak-store';
 import { isPromise } from '@agoric/produce-promise';

diff --git a/packages/ERTP/src/mathHelpers/natMathHelpers.js b/packages/ERTP/src/mathHelpers/natMathHelpers.js
@@ -1,5 +1,6 @@
+/* global harden */
+
 import Nat from '@agoric/nat';
-import harden from '@agoric/harden';
 
 // Fungible digital assets use the natMathHelpers to manage balances -
 // the operations are merely arithmetic on natural, non-negative

diff --git a/packages/ERTP/src/mathHelpers/setMathHelpers.js b/packages/ERTP/src/mathHelpers/setMathHelpers.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { passStyleOf } from '@agoric/marshal';
 import { assert, details } from '@agoric/assert';
 import { sameStructure } from '@agoric/same-structure';

diff --git a/packages/ERTP/src/mathHelpers/strSetMathHelpers.js b/packages/ERTP/src/mathHelpers/strSetMathHelpers.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { passStyleOf } from '@agoric/marshal';
 import { assert, details } from '@agoric/assert';
 

diff --git a/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js b/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 import produceIssuer from '../../../src/issuer';
 

diff --git a/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js b/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 function makeAliceMaker(E, log) {
   return harden({

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import makeAmountMath from '../../../src/amountMath';
 

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import makeAmountMath from '../../../src/amountMath';
 

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import makeAmountMath from '../../../src/amountMath';
 

diff --git a/packages/ERTP/test/unitTests/test-issuerObj.js b/packages/ERTP/test/unitTests/test-issuerObj.js
@@ -1,4 +1,5 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/install-ses';
 import test from 'tape-promise/tape';
 import { E } from '@agoric/eventual-send';
 

diff --git a/packages/ERTP/test/unitTests/test-mintObj.js b/packages/ERTP/test/unitTests/test-mintObj.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import produceIssuer from '../../src/issuer';
 

diff --git a/packages/acorn-eventual-send/encouragementBotCommsWavyDot/bootstrap.js b/packages/acorn-eventual-send/encouragementBotCommsWavyDot/bootstrap.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 // This javascript source file uses the "tildot" syntax (foo~.bar()) for
 // eventual sends.

diff --git a/packages/acorn-eventual-send/encouragementBotCommsWavyDot/vat-bot.js b/packages/acorn-eventual-send/encouragementBotCommsWavyDot/vat-bot.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 export default function setup(syscall, state, helpers) {
   function log(what) {

diff --git a/packages/acorn-eventual-send/encouragementBotCommsWavyDot/vat-user.js b/packages/acorn-eventual-send/encouragementBotCommsWavyDot/vat-user.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 // This javascript source file uses the "tildot" syntax (foo~.bar()) for
 // eventual sends.

diff --git a/packages/acorn-eventual-send/test/test-rollup.js b/packages/acorn-eventual-send/test/test-rollup.js
@@ -8,7 +8,7 @@ test('SwingSet bug', async t => {
     const bundle = await rollup({
       input: require.resolve('../encouragementBotCommsWavyDot/bootstrap.js'),
       treeshake: false,
-      external: ['@agoric/evaluate', '@agoric/nat', '@agoric/harden'],
+      external: ['@agoric/evaluate', '@agoric/nat'],
       acornInjectPlugins: [eventualSend(acorn)],
     });
     t.ok(bundle);

diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json
@@ -16,6 +16,7 @@
     "lint-check-jessie": "eslint -c '.eslintrc-jessie.js' '**/*.{js,jsx}'"
   },
   "devDependencies": {
+    "@agoric/install-ses": "0.1.0",
     "tap-spec": "^5.0.0",
     "tape": "^4.11.0",
     "tape-promise": "^4.0.0",

diff --git a/packages/agoric-cli/test/test-main.js b/packages/agoric-cli/test/test-main.js
@@ -1,4 +1,5 @@
 /* global globalThis */
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
 import fs from 'fs';
 import anylogger from 'anylogger';

diff --git a/packages/assert/package.json b/packages/assert/package.json
@@ -29,10 +29,10 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/harden": "^0.0.8"
   },
   "devDependencies": {
     "esm": "^3.2.25",
+    "@agoric/install-ses": "0.1.0",
     "tap-spec": "^5.0.0",
     "tape": "^4.11.0",
     "tape-promise": "^4.0.0"

diff --git a/packages/assert/src/assert.js b/packages/assert/src/assert.js
@@ -1,14 +1,13 @@
 // Copyright (C) 2019 Agoric, under Apache License 2.0
+
+/* global harden */
+
 // @ts-check
 
 // This module assumes the de-facto standard `console` host object.
 // To the extent that this `console` is considered a resource,
 // this module must be considered a resource module.
 
-import rawHarden from '@agoric/harden';
-
-const harden = /** @type {<T>(x: T) => T} */ (rawHarden);
-
 /**
  * Prepend the correct indefinite article onto a noun, typically a typeof result
  * e.g., "an Object" vs. "a Number"

diff --git a/packages/assert/test/test-assert.js b/packages/assert/test/test-assert.js
@@ -1,3 +1,4 @@
+import '@agoric/install-ses';
 import { test } from 'tape';
 import { an, assert, details, q } from '../src/assert';
 import { throwsAndLogs } from './throwsAndLogs';

diff --git a/packages/assert/test/throwsAndLogs.js b/packages/assert/test/throwsAndLogs.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 const { defineProperty } = Object;
 

diff --git a/packages/bundle-source/demo/dir1/index.js b/packages/bundle-source/demo/dir1/index.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { encourage, makeError } from './encourage';
 import more from './sub/more';
 

diff --git a/packages/bundle-source/package.json b/packages/bundle-source/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@agoric/acorn-eventual-send": "^2.0.5",
     "@agoric/babel-parser": "^7.6.4",
-    "@agoric/harden": "^0.0.8",
+    "@agoric/install-ses": "0.1.0",
     "@agoric/transform-eventual-send": "^1.3.0",
     "@babel/generator": "^7.6.4",
     "@rollup/plugin-commonjs": "^11.0.2",

diff --git a/packages/bundle-source/src/index.js b/packages/bundle-source/src/index.js
@@ -48,7 +48,7 @@ export default async function bundleSource(
     input: resolvedPath,
     treeshake: false,
     preserveModules: moduleFormat === 'nestedEvaluate',
-    external: ['@agoric/harden', ...externals],
+    external: [...externals],
     plugins: [
       resolvePlugin({ preferBuiltins: true }),
       tildotPlugin(),

diff --git a/packages/bundle-source/test/circular.js b/packages/bundle-source/test/circular.js
@@ -1,4 +1,5 @@
 /* global Compartment */
+
 import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
 import bundleSource from '..';
@@ -15,7 +16,6 @@ test('circular export', async t => {
       'nestedEvaluate',
     );
 
-    // Fake out `require('@agoric/harden')`.
     const require = _ => o => o;
     const nestedEvaluate = src => {
       // console.log('========== evaluating', src);

diff --git a/packages/bundle-source/test/sanity.js b/packages/bundle-source/test/sanity.js
@@ -1,4 +1,5 @@
 /* global Compartment */
+
 import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
 import bundleSource from '..';
@@ -21,9 +22,7 @@ test('nestedEvaluate', async t => {
     // console.log(srcMap1);
 
     t.equal(mf1, 'nestedEvaluate', 'module format is nestedEvaluate');
-    t.assert(src1.match(/require\('@agoric\/harden'\)/), 'harden is required');
 
-    // Fake out `require('@agoric/harden')`.
     const require = _ => o => o;
     const nestedEvaluate = src => {
       // console.log('========== evaluating', src);
@@ -78,9 +77,7 @@ test('getExport', async t => {
     // console.log(srcMap1);
 
     t.equal(mf1, 'getExport', 'module format is getExport');
-    t.assert(src1.match(/require\('@agoric\/harden'\)/), 'harden is required');
 
-    // Fake out `require('@agoric/harden')`.
     // eslint-disable-next-line no-eval
     const ex1 = eval(`const require = _ => o => o;${srcMap1}`)();
 

diff --git a/packages/bundle-source/test/tildot-transform.js b/packages/bundle-source/test/tildot-transform.js
@@ -1,3 +1,4 @@
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
 import bundleSource from '..';
 

diff --git a/packages/captp/lib/captp.js b/packages/captp/lib/captp.js
@@ -1,12 +1,13 @@
+/* global harden */
+
 // This logic was mostly lifted from @agoric/swingset-vat liveSlots.js
 // Defects in it are mfig's fault.
 import { Remotable, makeMarshal, QCLASS } from '@agoric/marshal';
-import harden from '@agoric/harden';
 import Nat from '@agoric/nat';
 import { HandledPromise, E } from '@agoric/eventual-send';
 import { isPromise } from '@agoric/produce-promise';
 
-export { E, HandledPromise, Nat, harden };
+export { E, HandledPromise, Nat };
 
 export function makeCapTP(ourId, send, bootstrapObj = undefined) {
   let unplug = false;

diff --git a/packages/captp/package.json b/packages/captp/package.json
@@ -32,13 +32,13 @@
     "lint-check-jessie": "eslint -c '.eslintrc-jessie.js' '**/*.js'"
   },
   "devDependencies": {
+    "@agoric/install-ses": "0.1.0",
     "tap-spec": "^5.0.0",
     "tape": "^4.11.0",
     "tape-promise": "^4.0.0"
   },
   "dependencies": {
     "@agoric/eventual-send": "^0.9.2",
-    "@agoric/harden": "^0.0.8",
     "@agoric/marshal": "^0.2.2",
     "@agoric/nat": "^2.0.1",
     "@agoric/produce-promise": "^0.1.2",

diff --git a/packages/captp/test/crosstalk.js b/packages/captp/test/crosstalk.js
@@ -1,5 +1,8 @@
+/* global harden */
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import { harden, makeCapTP, E } from '../lib/captp';
+import { makeCapTP, E } from '../lib/captp';
 
 test('prevent crosstalk', async t => {
   try {

diff --git a/packages/captp/test/disco.js b/packages/captp/test/disco.js
@@ -1,5 +1,8 @@
+/* global harden */
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import { harden, makeCapTP } from '../lib/captp';
+import { makeCapTP } from '../lib/captp';
 
 test('try disconnecting captp', async t => {
   try {

diff --git a/packages/captp/test/loopback.js b/packages/captp/test/loopback.js
@@ -1,5 +1,8 @@
+/* global harden */
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import { E, harden, makeCapTP } from '../lib/captp';
+import { E, makeCapTP } from '../lib/captp';
 
 test('try loopback captp', async t => {
   try {

diff --git a/packages/eventual-send/package.json b/packages/eventual-send/package.json
@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/harden": "^0.0.8"
   },
   "devDependencies": {
     "esm": "^3.2.7",
+    "@agoric/install-ses": "0.1.0",
     "rollup": "^1.2.2",
     "tape": "^4.11.0",
     "tape-promise": "^4.0.0"

diff --git a/packages/eventual-send/rollup.config.js b/packages/eventual-send/rollup.config.js
@@ -6,9 +6,9 @@ export default [
         file: 'dist/eventual-send.umd.js',
         format: 'umd',
         name: 'EventualSend',
-        globals: {
-          '@agoric/harden': 'harden',
-        },
+        // globals: {
+        //  '@agoric/harden': 'harden',
+        // },
       },
       {
         file: 'dist/eventual-send.esm.js',

diff --git a/packages/eventual-send/src/E.js b/packages/eventual-send/src/E.js
@@ -1,9 +1,8 @@
-/* global */
+/* global harden */
+
 // eslint-disable-next-line spaced-comment
 /// <reference path="index.d.ts" />
 
-import harden from '@agoric/harden';
-
 const readOnlyProxy = {
   set(_target, _prop, _value) {
     return false;

diff --git a/packages/eventual-send/src/index.js b/packages/eventual-send/src/index.js
@@ -1,6 +1,4 @@
-/* global HandledPromise */
-
-import harden from '@agoric/harden';
+/* global harden HandledPromise */
 
 import makeE from './E';
 

diff --git a/packages/eventual-send/test/test-e.js b/packages/eventual-send/test/test-e.js
@@ -1,3 +1,4 @@
+import '@agoric/install-ses';
 import test from 'tape-promise/tape';
 import { E, HandledPromise } from '../src/index';
 

diff --git a/packages/import-manager/package.json b/packages/import-manager/package.json
@@ -28,9 +28,9 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/harden": "^0.0.8"
   },
   "devDependencies": {
+    "@agoric/install-ses": "0.1.0",
     "esm": "^3.2.25",
     "tap-spec": "^5.0.0",
     "tape": "^4.11.0",

diff --git a/packages/import-manager/src/importManager.js b/packages/import-manager/src/importManager.js
@@ -1,6 +1,6 @@
 // Copyright (C) 2019 Agoric, under Apache License 2.0
 
-import harden from '@agoric/harden';
+/* global harden */
 
 // ImportManager allows a package to make some code available that can be run
 // locally by a calling vat without requiring a remote round trip to the hosting

diff --git a/packages/import-manager/test/unitTests/test-importsA.js b/packages/import-manager/test/unitTests/test-importsA.js
@@ -1,5 +1,6 @@
 // Copyright (C) 2019 Agoric, under Apache License 2.0
 
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
 import { makeGoodImportManager } from './goodImports';