From ad5d4bdfc5ea62cf4d3fdca832eb640d7638cee3 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Fri, 15 Mar 2019 18:01:43 -0400 Subject: [PATCH] Unexport `constants` from `order-utils`. Directly grab the EIP712 constants from the `order-utils` package in `/contracts/coordinator/test/util/hash_utils`. Update changelogs. --- contracts/coordinator/CHANGELOG.json | 5 ++++- contracts/coordinator/test/utils/hash_utils.ts | 3 ++- packages/order-utils/CHANGELOG.json | 15 ++++++--------- packages/order-utils/src/index.ts | 2 -- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/contracts/coordinator/CHANGELOG.json b/contracts/coordinator/CHANGELOG.json index 5505b07299..5860b5b122 100644 --- a/contracts/coordinator/CHANGELOG.json +++ b/contracts/coordinator/CHANGELOG.json @@ -6,7 +6,10 @@ "note": "Created Coordinator package" }, { - "note": "Use mixed EIP712 domains for transactions and approvals." + "note": "Use mixed EIP712 domains for transactions and approvals" + }, + { + "note": "Add `SignatureType.Invalid`" } ] } diff --git a/contracts/coordinator/test/utils/hash_utils.ts b/contracts/coordinator/test/utils/hash_utils.ts index faca38f2c2..caba4cf3c8 100644 --- a/contracts/coordinator/test/utils/hash_utils.ts +++ b/contracts/coordinator/test/utils/hash_utils.ts @@ -1,4 +1,5 @@ -import { constants, eip712Utils, transactionHashUtils } from '@0x/order-utils'; +import { eip712Utils, transactionHashUtils } from '@0x/order-utils'; +import { constants } from '@0x/order-utils/lib/src/constants'; import { SignedZeroExTransaction } from '@0x/types'; import { BigNumber, signTypedDataUtils } from '@0x/utils'; import * as _ from 'lodash'; diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 9d3859b009..3425381ffd 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,14 +1,11 @@ [ { - "version" : "7.1.0", - "changes": [ - { - "note": "Add Coordinator EIP712 constants" - }, - { - "note": "Export constants" - } - ] + "version": "7.1.0", + "changes": [ + { + "note": "Add Coordinator EIP712 constants" + } + ] }, { "timestamp": 1551479279, diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index d745df68f6..92d404665f 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -73,5 +73,3 @@ export { FeeOrdersAndRemainingFeeAmount, OrdersAndRemainingFillAmount, } from './types'; - -export { constants } from './constants';