fix: merge damage

Agoric · Aug 6, 2021 · 9be3ee7 · 9be3ee7
1 parent bf08764
commit 9be3ee7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/packages/marshal/src/helpers/remotable.js b/packages/marshal/src/helpers/remotable.js
@@ -40,7 +40,7 @@ const {
 // flag entirely and fix code that uses it (as if it were always `false`).
 //
 // Exported only for testing during the transition
-export const ALLOW_IMPLICIT_REMOTABLES = true;
+export const ALLOW_IMPLICIT_REMOTABLES = false;
 
 /**
  * @param {InterfaceSpec} iface

diff --git a/packages/marshal/src/passStyleOf.js b/packages/marshal/src/passStyleOf.js
@@ -14,17 +14,6 @@ import { RemotableHelper } from './helpers/remotable.js';
 import './types.js';
 import './helpers/internal-types.js';
 
-// Setting this flag to true is what allows objects with `null` or
-// `Object.prototype` prototypes to be treated as remotable.  Setting to `false`
-// means that only objects declared with `Remotable(...)`, including `Far(...)`
-// can be used as remotables.
-//
-// TODO: once the policy changes to force remotables to be explicit, remove this
-// flag entirely and fix code that uses it (as if it were always `false`).
-//
-// Exported only for testing during the transition
-export const ALLOW_IMPLICIT_REMOTABLES = false;
-
 const { details: X, quote: q } = assert;
 const { ownKeys } = Reflect;
 const { isFrozen } = Object;