Merge branch 'development' into feature/website/wallet-wrap

* development: (35 commits)
  Fix CHANGELOG
  Update Yarn.lock
  Standardize changelog dates and format
  Fix stubbing of a non-existent property
  Remove redundant cast
  Move common types out of web3 types
  Add monorepo_scripts to npmignore
  Add typeRoots
  Add clean-state tests
  Remove nested .gitignore files since `yarn publish` gets confused by them and ignores their contents on the top-level scope
  Remove WETH hack now that updated WETH address is in TokenRegistry
  Revert TokenRegistry address on Kovan
  Improve rounding error message
  Portal fill with mixed decimals
  Add error popover if TokenRegistry on network user is browsing on don't include the requisite default tokens for 0x Portal to function
  Set timeout for compiler tests
  Remove redundant types
  Add missing param comments
  Fix a comment
  Add a comment
  ...

1 files changed, 76 insertions, 0 deletions

diff --git a/packages/deployer/test/deployer_test.ts b/packages/deployer/test/deployer_test.ts
new file mode 100644
index 000000000..9c34d74aa
--- /dev/null
+++ b/packages/deployer/test/deployer_test.ts
@@ -0,0 +1,76 @@
+import * as chai from 'chai';
+import 'mocha';
+
+import { Compiler } from '../src/compiler';
+import { Deployer } from '../src/deployer';
+import { fsWrapper } from '../src/utils/fs_wrapper';
+import { CompilerOptions, ContractArtifact, ContractNetworkData, DoneCallback } from '../src/utils/types';
+
+import { constructor_args, exchange_binary } from './fixtures/exchange_bin';
+import { constants } from './util/constants';
+
+const expect = chai.expect;
+
+describe('#Deployer', () => {
+    const artifactsDir = `${__dirname}/fixtures/artifacts`;
+    const contractsDir = `${__dirname}/fixtures/contracts`;
+    const exchangeArtifactPath = `${artifactsDir}/Exchange.json`;
+    const compilerOpts: CompilerOptions = {
+        artifactsDir,
+        contractsDir,
+        networkId: constants.networkId,
+        optimizerEnabled: constants.optimizerEnabled,
+        specifiedContracts: new Set(constants.specifiedContracts),
+    };
+    const compiler = new Compiler(compilerOpts);
+    const deployerOpts = {
+        artifactsDir,
+        networkId: constants.networkId,
+        jsonrpcUrl: constants.jsonrpcUrl,
+        defaults: {
+            gasPrice: constants.gasPrice,
+        },
+    };
+    const deployer = new Deployer(deployerOpts);
+    beforeEach(function(done: DoneCallback) {
+        this.timeout(constants.timeoutMs);
+        (async () => {
+            if (fsWrapper.doesPathExistSync(exchangeArtifactPath)) {
+                await fsWrapper.removeFileAsync(exchangeArtifactPath);
+            }
+            await compiler.compileAsync();
+            done();
+        })().catch(done);
+    });
+    describe('#deployAsync', () => {
+        it('should deploy the Exchange contract without updating the Exchange artifact', async () => {
+            const exchangeConstructorArgs = [constants.zrxTokenAddress, constants.tokenTransferProxyAddress];
+            const exchangeContractInstance = await deployer.deployAsync('Exchange', exchangeConstructorArgs);
+            const opts = {
+                encoding: 'utf8',
+            };
+            const exchangeArtifactString = await fsWrapper.readFileAsync(exchangeArtifactPath, opts);
+            const exchangeArtifact: ContractArtifact = JSON.parse(exchangeArtifactString);
+            const exchangeContractData: ContractNetworkData = exchangeArtifact.networks[constants.networkId];
+            const exchangeAddress = exchangeContractInstance.address;
+            expect(exchangeAddress).to.not.equal(undefined);
+            expect(exchangeContractData.address).to.equal(undefined);
+            expect(exchangeContractData.constructor_args).to.equal(undefined);
+        });
+    });
+    describe('#deployAndSaveAsync', () => {
+        it('should save the correct contract address and constructor arguments to the Exchange artifact', async () => {
+            const exchangeConstructorArgs = [constants.zrxTokenAddress, constants.tokenTransferProxyAddress];
+            const exchangeContractInstance = await deployer.deployAndSaveAsync('Exchange', exchangeConstructorArgs);
+            const opts = {
+                encoding: 'utf8',
+            };
+            const exchangeArtifactString = await fsWrapper.readFileAsync(exchangeArtifactPath, opts);
+            const exchangeArtifact: ContractArtifact = JSON.parse(exchangeArtifactString);
+            const exchangeContractData: ContractNetworkData = exchangeArtifact.networks[constants.networkId];
+            const exchangeAddress = exchangeContractInstance.address;
+            expect(exchangeAddress).to.be.equal(exchangeContractData.address);
+            expect(constructor_args).to.be.equal(exchangeContractData.constructor_args);
+        });
+    });
+});