Merge branch 'development' into feature/testnet-faucets/order-dispenser

* development: (37 commits)
  Add dates to CHANGELOGs
  Change CHANGELOGs
  Add .editorconfig
  Fix a typo
  Temp
  Use forEach instead of map
  Add PR number
  Fix an exception when a signature collision happens
  Fix prettier
  Add regression tests
  Improve the comment and fix an exception
  Add missing comas
  Lerna-ignore tslint and tsconfig
  Update contract versions, fix tests
  Rename directories
  Rename previous contracts, fix imports, add nested file structure
  Move all contracts into a single directory
  Update import
  Fix import
  Get rid of suffixed contract versioning and replace it with a poor-mans package manager. Versions are stored locally, and are generated in a copy-on-write basis as required
  ...

2 files changed, 10 insertions, 13 deletions

diff --git a/packages/contracts/util/artifacts.ts b/packages/contracts/util/artifacts.ts
index 145b1db3b..fd9380d1d 100644
--- a/packages/contracts/util/artifacts.ts
+++ b/packages/contracts/util/artifacts.ts
@@ -1,21 +1,19 @@
-import * as DummyTokenArtifact from '../build/artifacts/DummyToken.json';
-import * as DummyTokenV2Artifact from '../build/artifacts/DummyToken_v2.json';
-import * as ExchangeArtifact from '../build/artifacts/Exchange.json';
-import * as MaliciousTokenArtifact from '../build/artifacts/MaliciousToken.json';
-import * as MultiSigWalletWithTimeLockArtifact from '../build/artifacts/MultiSigWalletWithTimeLock.json';
-import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact from '../build/artifacts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json';
-import * as TokenArtifact from '../build/artifacts/Token.json';
-import * as TokenRegistryArtifact from '../build/artifacts/TokenRegistry.json';
-import * as TokenTransferProxyArtifact from '../build/artifacts/TokenTransferProxy.json';
-import * as EtherTokenArtifact from '../build/artifacts/WETH9.json';
-import * as ZRXArtifact from '../build/artifacts/ZRXToken.json';
+import * as DummyTokenArtifact from '../artifacts/DummyToken.json';
+import * as ExchangeArtifact from '../artifacts/Exchange.json';
+import * as MaliciousTokenArtifact from '../artifacts/MaliciousToken.json';
+import * as MultiSigWalletWithTimeLockArtifact from '../artifacts/MultiSigWalletWithTimeLock.json';
+import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact from '../artifacts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json';
+import * as TokenArtifact from '../artifacts/Token.json';
+import * as TokenRegistryArtifact from '../artifacts/TokenRegistry.json';
+import * as TokenTransferProxyArtifact from '../artifacts/TokenTransferProxy.json';
+import * as EtherTokenArtifact from '../artifacts/WETH9.json';
+import * as ZRXArtifact from '../artifacts/ZRXToken.json';
 
 import { Artifact } from './types';
 
 export const artifacts = {
     ZRXArtifact: (ZRXArtifact as any) as Artifact,
     DummyTokenArtifact: (DummyTokenArtifact as any) as Artifact,
-    DummyTokenV2Artifact: (DummyTokenV2Artifact as any) as Artifact,
     TokenArtifact: (TokenArtifact as any) as Artifact,
     ExchangeArtifact: (ExchangeArtifact as any) as Artifact,
     EtherTokenArtifact: (EtherTokenArtifact as any) as Artifact,
diff --git a/packages/contracts/util/types.ts b/packages/contracts/util/types.ts
index 0db04cd76..38fd33161 100644
--- a/packages/contracts/util/types.ts
+++ b/packages/contracts/util/types.ts
@@ -126,7 +126,6 @@ export enum ContractName {
     Exchange = 'Exchange',
     ZRXToken = 'ZRXToken',
     DummyToken = 'DummyToken',
-    DummyToken_v2 = 'DummyToken_v2',
     EtherToken = 'WETH9',
     MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress = 'MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress',
     MaliciousToken = 'MaliciousToken',