Merge pull request #115 from lukehedger/master

Fix build, lint and fix commands
plasma-group · Mar 26, 2019 · cef3d46 · cef3d46
2 parents a971b53 + 14e230e
commit cef3d46
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -10,7 +10,7 @@
     "test": "mocha --require ts-node/register 'test/**/*.spec.ts'",
     "lint": "tslint --format stylish --project .",
     "fix": "prettier --config ./.prettierrc.js --write 'index.ts' '{src,test}/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -10,7 +10,7 @@
     "test": "mocha --require ts-node/register 'test/**/*.spec.ts'",
     "lint": "tslint --format stylish --project .",
     "fix": "prettier --config ./.prettierrc.js --write 'index.ts' '{src,test}/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",

diff --git a/packages/core/test/ethereum.ts b/packages/core/test/ethereum.ts
@@ -5,7 +5,7 @@ class Ethereum {
   private ethereum: Http2Server
 
   constructor() {
-    this.ethereum = ganache.server({ gasLimit: '0x7A1200' })
+    this.ethereum = ganache.server({ gasLimit: '0x7A1200', port: 8545 })
   }
 
   public async startEth(): Promise<void> {

diff --git a/packages/operator/package.json b/packages/operator/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "lint": "tslint --format stylish --project .",
     "fix": "prettier --config ./.prettierrc.js --write 'index.ts' '{src,test}/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",

diff --git a/packages/plasma-js/package.json b/packages/plasma-js/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "lint": "tslint --format stylish --project .",
     "fix": "prettier --config ./.prettierrc.js --write 'index.ts' '{src,test}/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -8,8 +8,8 @@
   ],
   "scripts": {
     "lint": "tslint --format stylish --project .",
-    "fix": "prettier --config ./.prettierrc.js --write 'index.ts' '{src,test}/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "fix": "prettier --config ./.prettierrc.js --write 'types/**/*.ts'",
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",

diff --git a/packages/types/types/ganache-cli/index.d.ts b/packages/types/types/ganache-cli/index.d.ts
@@ -6,6 +6,7 @@ declare module 'ganache-cli' {
 
   interface GanacheServerOptions {
     gasLimit: string
+    port: number
   }
 
   interface Ganache {

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -10,7 +10,7 @@
     "test": "mocha --require ts-node/register 'test/**/*.spec.ts'",
     "lint": "tslint --format stylish --project .",
     "fix": "prettier --config ./.prettierrc.js --write 'index.ts' '{src,test}/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",

diff --git a/packages/verifier/package.json b/packages/verifier/package.json
@@ -10,7 +10,7 @@
     "test": "mocha --require ts-node/register 'test/**/*.spec.ts'",
     "lint": "tslint --format stylish --project .",
     "fix": "prettier --config ./.prettierrc.js --write 'index.ts' '{src,test}/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",

diff --git a/packages/vyper-js/package.json b/packages/vyper-js/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "lint": "tslint --format stylish --project .",
     "fix": "prettier --config ./.prettierrc.js --write 'index.ts' 'src/**/*.ts'",
-    "build": "yarn tsc -p ."
+    "build": "tsc -p ."
   },
   "keywords": [
     "plasma",