diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 3d5b4d7574..88b7c01cd8 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -38,7 +38,7 @@ "config": { "publicInterfaceContracts": "Exchange,IExchange", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.", - "abis": "./test/generated-artifacts/@(Exchange|IAssetProxy|IAssetProxyDispatcher|IEIP1271Data|IEIP1271Wallet|IExchange|IExchangeCore|IMatchOrders|IProtocolFees|ISignatureValidator|ITransactions|ITransferSimulator|IWallet|IWrapperFunctions|IsolatedExchange|LibExchangeRichErrorDecoder|MixinAssetProxyDispatcher|MixinExchangeCore|MixinMatchOrders|MixinProtocolFees|MixinSignatureValidator|MixinTransactions|MixinTransferSimulator|MixinWrapperFunctions|ReentrancyTester|TestAssetProxyDispatcher|TestExchangeInternals|TestFillRounding|TestLibExchangeRichErrorDecoder|TestProtocolFeeCollector|TestProtocolFees|TestProtocolFeesReceiver|TestSignatureValidator|TestTransactions|TestValidatorWallet|TestWrapperFunctions).json" + "abis": "./test/generated-artifacts/@(Exchange|IAssetProxy|IAssetProxyDispatcher|IEIP1271Data|IEIP1271Wallet|IExchange|IExchangeCore|IMatchOrders|IProtocolFees|ISignatureValidator|ITransactions|ITransferSimulator|IWallet|IWrapperFunctions|IsolatedExchange|LibExchangeRichErrorDecoder|MixinAssetProxyDispatcher|MixinExchangeCore|MixinMatchOrders|MixinProtocolFees|MixinSignatureValidator|MixinTransactions|MixinTransferSimulator|MixinWrapperFunctions|ReentrancyTester|TestAssetProxyDispatcher|TestExchangeInternals|TestFillRounding|TestLibExchangeRichErrorDecoder|TestProtocolFeeCollector|TestProtocolFees|TestProtocolFeesReceiver|TestTransactions|TestValidatorWallet|TestWrapperFunctions).json" }, "repository": { "type": "git", diff --git a/contracts/exchange/test/signature_validator.ts b/contracts/exchange/test/signature_validator.ts index 0d5c1a775e..cbf5a79efd 100644 --- a/contracts/exchange/test/signature_validator.ts +++ b/contracts/exchange/test/signature_validator.ts @@ -14,7 +14,6 @@ import { randomAddress, TransactionFactory, transactionHashUtils, - ValidatorWalletAction, } from '@0x/contracts-test-utils'; import { SignatureType, SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { BigNumber, StringRevertError } from '@0x/utils'; @@ -31,6 +30,17 @@ import { TestValidatorWalletContract, } from './wrappers'; +enum ValidatorWalletAction { + Reject = 0, + Accept = 1, + Revert = 2, + UpdateState = 3, + MatchSignatureHash = 4, + ReturnTrue = 5, + ReturnNothing = 6, + NTypes = 7, +} + // tslint:disable:no-unnecessary-type-assertion blockchainTests.resets('MixinSignatureValidator', env => { let chainId: number; diff --git a/contracts/test-utils/src/index.ts b/contracts/test-utils/src/index.ts index bc670d2373..ea304a3afe 100644 --- a/contracts/test-utils/src/index.ts +++ b/contracts/test-utils/src/index.ts @@ -57,7 +57,6 @@ export { TokenBalances, TransactionDataParams, ExchangeFunctionName, - ValidatorWalletAction, } from './types'; export { blockchainTests, BlockchainTestsEnvironment, describe } from './mocha_blockchain'; export { chaiSetup, expect } from './chai_setup'; diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts index 20cb8ddc37..2db80a1437 100644 --- a/contracts/test-utils/src/types.ts +++ b/contracts/test-utils/src/types.ts @@ -201,14 +201,3 @@ export enum ExchangeFunctionName { SetProtocolFeeCollectorAddress = 'setProtocolFeeCollectorAddress', DetachProtocolFeeCollector = 'detachProtocolFeeCollector', } - -export enum ValidatorWalletAction { - Reject = 0, - Accept = 1, - Revert = 2, - UpdateState = 3, - MatchSignatureHash = 4, - ReturnTrue = 5, - ReturnNothing = 6, - NTypes = 7, -}