Merge branch 'development' into feature/portal-ledger-support

* development: (437 commits)
  Publish
  Update yarn.lock
  Update the CHANGELOG
  Fix the bug making it impossible to specify the custom ZRX address
  Fix fill/cancel order by looking for NoError instead of empty blockchainErr given the BlockchainErrs type refactor
  Add a comment about a yarn bug
  Add our mainnet and kovan nodes as backups for Portal requests
  Fix bug hiding the user info from topBar
  Add dev-utils package to top level README
  Prettier newline
  Prettier
  Allow Token symbols to be alphanumeric
  Update CHANGELOG, rebase on development
  Should not -> cannot
  Reject negative amounts in isValidBaseUnitAmount
  Re-add changelog for 0x.js
  Fix prettier
  Update yarn.lock
  Move tests to a separate folder
  Change file layout
  ...

# Conflicts:
#	packages/website/README.md

5 files changed, 33 insertions, 42 deletions

diff --git a/packages/website/ts/schemas/order_schema.ts b/packages/website/ts/schemas/order_schema.ts
index 61b93d273..bfbf9eb8b 100644
--- a/packages/website/ts/schemas/order_schema.ts
+++ b/packages/website/ts/schemas/order_schema.ts
@@ -1,24 +1,15 @@
 export const orderSchema = {
     id: '/Order',
     properties: {
-        maker: {$ref: '/OrderTaker'},
-        taker: {$ref: '/OrderTaker'},
-        salt: {type: 'string'},
-        signature: {$ref: '/SignatureData'},
-        expiration: {type: 'string'},
-        feeRecipient: {type: 'string'},
-        exchangeContract: {type: 'string'},
-        networkId: {type: 'number'},
+        maker: { $ref: '/OrderTaker' },
+        taker: { $ref: '/OrderTaker' },
+        salt: { type: 'string' },
+        signature: { $ref: '/SignatureData' },
+        expiration: { type: 'string' },
+        feeRecipient: { type: 'string' },
+        exchangeContract: { type: 'string' },
+        networkId: { type: 'number' },
     },
-    required: [
-        'maker',
-        'taker',
-        'salt',
-        'signature',
-        'expiration',
-        'feeRecipient',
-        'exchangeContract',
-        'networkId',
-    ],
+    required: ['maker', 'taker', 'salt', 'signature', 'expiration', 'feeRecipient', 'exchangeContract', 'networkId'],
     type: 'object',
 };
diff --git a/packages/website/ts/schemas/order_taker_schema.ts b/packages/website/ts/schemas/order_taker_schema.ts
index 6b484a60d..c784c29c5 100644
--- a/packages/website/ts/schemas/order_taker_schema.ts
+++ b/packages/website/ts/schemas/order_taker_schema.ts
@@ -1,10 +1,10 @@
 export const orderTakerSchema = {
     id: '/OrderTaker',
     properties: {
-        address: {type: 'string'},
-        token: {$ref: '/Token'},
-        amount: {type: 'string'},
-        feeAmount: {type: 'string'},
+        address: { type: 'string' },
+        token: { $ref: '/Token' },
+        amount: { type: 'string' },
+        feeAmount: { type: 'string' },
     },
     required: ['address', 'token', 'amount', 'feeAmount'],
     type: 'object',
diff --git a/packages/website/ts/schemas/signature_data_schema.ts b/packages/website/ts/schemas/signature_data_schema.ts
index d208cc438..8d3f15926 100644
--- a/packages/website/ts/schemas/signature_data_schema.ts
+++ b/packages/website/ts/schemas/signature_data_schema.ts
@@ -1,10 +1,10 @@
 export const signatureDataSchema = {
     id: '/SignatureData',
     properties: {
-        hash: {type: 'string'},
-        r: {type: 'string'},
-        s: {type: 'string'},
-        v: {type: 'number'},
+        hash: { type: 'string' },
+        r: { type: 'string' },
+        s: { type: 'string' },
+        v: { type: 'number' },
     },
     required: ['hash', 'r', 's', 'v'],
     type: 'object',
diff --git a/packages/website/ts/schemas/token_schema.ts b/packages/website/ts/schemas/token_schema.ts
index c15f57429..92b53a463 100644
--- a/packages/website/ts/schemas/token_schema.ts
+++ b/packages/website/ts/schemas/token_schema.ts
@@ -1,10 +1,10 @@
 export const tokenSchema = {
     id: '/Token',
     properties: {
-        name: {type: 'string'},
-        symbol: {type: 'string'},
-        decimals: {type: 'number'},
-        address: {type: 'string'},
+        name: { type: 'string' },
+        symbol: { type: 'string' },
+        decimals: { type: 'number' },
+        address: { type: 'string' },
     },
     required: ['name', 'symbol', 'decimals', 'address'],
     type: 'object',
diff --git a/packages/website/ts/schemas/validator.ts b/packages/website/ts/schemas/validator.ts
index e8eb4aaf2..5177501c6 100644
--- a/packages/website/ts/schemas/validator.ts
+++ b/packages/website/ts/schemas/validator.ts
@@ -1,19 +1,19 @@
-import {Schema as JSONSchema, Validator} from 'jsonschema';
-import {orderSchema} from 'ts/schemas/order_schema';
-import {orderTakerSchema} from 'ts/schemas/order_taker_schema';
-import {signatureDataSchema} from 'ts/schemas/signature_data_schema';
-import {tokenSchema} from 'ts/schemas/token_schema';
+import { Schema as JSONSchema, Validator } from 'jsonschema';
+import { orderSchema } from 'ts/schemas/order_schema';
+import { orderTakerSchema } from 'ts/schemas/order_taker_schema';
+import { signatureDataSchema } from 'ts/schemas/signature_data_schema';
+import { tokenSchema } from 'ts/schemas/token_schema';
 
 export class SchemaValidator {
-    private validator: Validator;
+    private _validator: Validator;
     constructor() {
-        this.validator = new Validator();
-        this.validator.addSchema(signatureDataSchema as JSONSchema, signatureDataSchema.id);
-        this.validator.addSchema(tokenSchema as JSONSchema, tokenSchema.id);
-        this.validator.addSchema(orderTakerSchema as JSONSchema, orderTakerSchema.id);
-        this.validator.addSchema(orderSchema as JSONSchema, orderSchema.id);
+        this._validator = new Validator();
+        this._validator.addSchema(signatureDataSchema as JSONSchema, signatureDataSchema.id);
+        this._validator.addSchema(tokenSchema as JSONSchema, tokenSchema.id);
+        this._validator.addSchema(orderTakerSchema as JSONSchema, orderTakerSchema.id);
+        this._validator.addSchema(orderSchema as JSONSchema, orderSchema.id);
     }
     public validate(instance: object, schema: Schema) {
-        return this.validator.validate(instance, schema);
+        return this._validator.validate(instance, schema);
     }
 }