crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move ValidatorWalletAction to signature_validator.ts

Browse Source
This commit is contained in:
Michael Zhu 2019-11-14 15:49:13 -08:00
parent 7f4cbba076
commit c1d78a94a2
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/exchange/package.json
View File

@ -38,7 +38,7 @@
"config": { "config": {
"publicInterfaceContracts": "Exchange,IExchange", "publicInterfaceContracts": "Exchange,IExchange",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.", "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": { "repository": {
"type": "git", "type": "git",

12
contracts/exchange/test/signature_validator.ts
View File

@ -14,7 +14,6 @@ import {
randomAddress, randomAddress,
TransactionFactory, TransactionFactory,
transactionHashUtils, transactionHashUtils,
ValidatorWalletAction,
} from '@0x/contracts-test-utils'; } from '@0x/contracts-test-utils';
import { SignatureType, SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { SignatureType, SignedOrder, SignedZeroExTransaction } from '@0x/types';
import { BigNumber, StringRevertError } from '@0x/utils'; import { BigNumber, StringRevertError } from '@0x/utils';
@ -31,6 +30,17 @@ import {
TestValidatorWalletContract, TestValidatorWalletContract,
} from './wrappers'; } 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 // tslint:disable:no-unnecessary-type-assertion
blockchainTests.resets('MixinSignatureValidator', env => { blockchainTests.resets('MixinSignatureValidator', env => {
let chainId: number; let chainId: number;

1
contracts/test-utils/src/index.ts
View File

@ -57,7 +57,6 @@ export {
TokenBalances, TokenBalances,
TransactionDataParams, TransactionDataParams,
ExchangeFunctionName, ExchangeFunctionName,
ValidatorWalletAction,
} from './types'; } from './types';
export { blockchainTests, BlockchainTestsEnvironment, describe } from './mocha_blockchain'; export { blockchainTests, BlockchainTestsEnvironment, describe } from './mocha_blockchain';
export { chaiSetup, expect } from './chai_setup'; export { chaiSetup, expect } from './chai_setup';

11
contracts/test-utils/src/types.ts
View File

@ -201,14 +201,3 @@ export enum ExchangeFunctionName {
SetProtocolFeeCollectorAddress = 'setProtocolFeeCollectorAddress', SetProtocolFeeCollectorAddress = 'setProtocolFeeCollectorAddress',
DetachProtocolFeeCollector = 'detachProtocolFeeCollector', DetachProtocolFeeCollector = 'detachProtocolFeeCollector',
} }
export enum ValidatorWalletAction {
Reject = 0,
Accept = 1,
Revert = 2,
UpdateState = 3,
MatchSignatureHash = 4,
ReturnTrue = 5,
ReturnNothing = 6,
NTypes = 7,
}