aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/contracts/package.json4
-rw-r--r--packages/deployer/package.json12
-rw-r--r--packages/deployer/test/deploy_test.ts (renamed from packages/deployer/src/test/deploy_test.ts)8
-rw-r--r--packages/deployer/test/fixtures/contracts/Exchange.sol (renamed from packages/deployer/src/test/fixtures/contracts/Exchange.sol)0
-rw-r--r--packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol (renamed from packages/deployer/src/test/fixtures/contracts/TokenTransferProxy.sol)0
-rw-r--r--packages/deployer/test/fixtures/contracts/base/Ownable.sol (renamed from packages/deployer/src/test/fixtures/contracts/base/Ownable.sol)0
-rw-r--r--packages/deployer/test/fixtures/contracts/base/SafeMath.sol (renamed from packages/deployer/src/test/fixtures/contracts/base/SafeMath.sol)0
-rw-r--r--packages/deployer/test/fixtures/contracts/base/Token.sol (renamed from packages/deployer/src/test/fixtures/contracts/base/Token.sol)0
-rw-r--r--packages/deployer/test/fixtures/exchange_bin.ts (renamed from packages/deployer/src/test/fixtures/exchange_bin.ts)0
-rw-r--r--packages/deployer/test/util/constants.ts (renamed from packages/deployer/src/test/util/constants.ts)0
-rw-r--r--packages/deployer/tsconfig.json1
11 files changed, 13 insertions, 12 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 0f70ab308..4040c0d39 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -11,9 +11,9 @@
"build":
"rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;",
"test": "npm run build; truffle test",
- "compile": "node ../deployer/lib/cli.js compile",
+ "compile": "node ../deployer/lib/src/cli.js compile",
"clean": "rm -rf ./lib",
- "migrate": "node ../deployer/lib/cli.js migrate",
+ "migrate": "node ../deployer/lib/src/cli.js migrate",
"lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
"test:circleci": "yarn test"
},
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index d664b050c..b359382c5 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -2,18 +2,18 @@
"name": "@0xproject/deployer",
"version": "0.0.1",
"description": "Smart contract deployer of 0x protocol",
- "main": "lib/cli.js",
+ "main": "lib/src/cli.js",
"scripts": {
- "build": "yarn clean && copyfiles -u 1 'src/test/fixtures/contracts/**/*' src/solc/solc_bin/* ./lib && tsc",
+ "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' src/solc/solc_bin/* ./lib && tsc",
"test": "npm run build; mocha lib/test/*_test.js",
- "compile": "npm run build; node lib/cli.js compile",
+ "compile": "npm run build; node lib/src/cli.js compile",
"clean": "rm -rf ./lib",
- "migrate": "npm run build; node lib/cli.js migrate",
- "lint": "tslint --project . 'src/**/*.ts'",
+ "migrate": "npm run build; node lib/src/cli.js migrate",
+ "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
"test:circleci": "yarn test"
},
"bin": {
- "0x-deployer": "lib/cli.js"
+ "0x-deployer": "lib/src/cli.js"
},
"repository": {
"type": "git",
diff --git a/packages/deployer/src/test/deploy_test.ts b/packages/deployer/test/deploy_test.ts
index e15985e11..5df729a04 100644
--- a/packages/deployer/src/test/deploy_test.ts
+++ b/packages/deployer/test/deploy_test.ts
@@ -1,10 +1,10 @@
import * as chai from 'chai';
import 'mocha';
-import { Compiler } from '../compiler';
-import { Deployer } from '../deployer';
-import { fsWrapper } from '../utils/fs_wrapper';
-import { CompilerOptions, ContractArtifact, ContractData, DoneCallback } from '../utils/types';
+import { Compiler } from '../src/compiler';
+import { Deployer } from '../src/deployer';
+import { fsWrapper } from '../src/utils/fs_wrapper';
+import { CompilerOptions, ContractArtifact, ContractData, DoneCallback } from '../src/utils/types';
import { constructor_args, exchange_binary } from './fixtures/exchange_bin';
import { constants } from './util/constants';
diff --git a/packages/deployer/src/test/fixtures/contracts/Exchange.sol b/packages/deployer/test/fixtures/contracts/Exchange.sol
index 1b6819700..1b6819700 100644
--- a/packages/deployer/src/test/fixtures/contracts/Exchange.sol
+++ b/packages/deployer/test/fixtures/contracts/Exchange.sol
diff --git a/packages/deployer/src/test/fixtures/contracts/TokenTransferProxy.sol b/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol
index 90c8e7d66..90c8e7d66 100644
--- a/packages/deployer/src/test/fixtures/contracts/TokenTransferProxy.sol
+++ b/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol
diff --git a/packages/deployer/src/test/fixtures/contracts/base/Ownable.sol b/packages/deployer/test/fixtures/contracts/base/Ownable.sol
index 2a74c3717..2a74c3717 100644
--- a/packages/deployer/src/test/fixtures/contracts/base/Ownable.sol
+++ b/packages/deployer/test/fixtures/contracts/base/Ownable.sol
diff --git a/packages/deployer/src/test/fixtures/contracts/base/SafeMath.sol b/packages/deployer/test/fixtures/contracts/base/SafeMath.sol
index 7414684a8..7414684a8 100644
--- a/packages/deployer/src/test/fixtures/contracts/base/SafeMath.sol
+++ b/packages/deployer/test/fixtures/contracts/base/SafeMath.sol
diff --git a/packages/deployer/src/test/fixtures/contracts/base/Token.sol b/packages/deployer/test/fixtures/contracts/base/Token.sol
index c03f8c567..c03f8c567 100644
--- a/packages/deployer/src/test/fixtures/contracts/base/Token.sol
+++ b/packages/deployer/test/fixtures/contracts/base/Token.sol
diff --git a/packages/deployer/src/test/fixtures/exchange_bin.ts b/packages/deployer/test/fixtures/exchange_bin.ts
index a6eae515e..a6eae515e 100644
--- a/packages/deployer/src/test/fixtures/exchange_bin.ts
+++ b/packages/deployer/test/fixtures/exchange_bin.ts
diff --git a/packages/deployer/src/test/util/constants.ts b/packages/deployer/test/util/constants.ts
index d52076607..d52076607 100644
--- a/packages/deployer/src/test/util/constants.ts
+++ b/packages/deployer/test/util/constants.ts
diff --git a/packages/deployer/tsconfig.json b/packages/deployer/tsconfig.json
index 25c28b72a..4e1edb510 100644
--- a/packages/deployer/tsconfig.json
+++ b/packages/deployer/tsconfig.json
@@ -7,6 +7,7 @@
},
"include": [
"./src/**/*",
+ "./test/**/*",
"../../node_modules/types-bn/index.d.ts",
"../../node_modules/types-ethereumjs-util/index.d.ts",
"../../node_modules/chai-typescript-typings/index.d.ts",