diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-05-29 17:42:44 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-29 17:42:44 +0800 |
commit | 3819030a40af3d1cd2a9afddb125055c7e1e1ace (patch) | |
tree | a2c0299fb3f4180bffc7901ec3e4a9144190fbf6 | |
parent | 62cc3b919c73b7726793808e3b9631dba41cef28 (diff) | |
parent | 209d8483cf48a87a8e90de2b9a5be840dfc23613 (diff) | |
download | dexon-0x-contracts-3819030a40af3d1cd2a9afddb125055c7e1e1ace.tar.gz dexon-0x-contracts-3819030a40af3d1cd2a9afddb125055c7e1e1ace.tar.zst dexon-0x-contracts-3819030a40af3d1cd2a9afddb125055c7e1e1ace.zip |
Merge pull request #15 from 0xProject/rm-ts
Remove typescript folder
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/0x.js.ts (renamed from src/ts/0x.js.ts) | 0 | ||||
-rw-r--r-- | src/contract_wrappers/contract_wrapper.ts (renamed from src/ts/contract_wrappers/contract_wrapper.ts) | 0 | ||||
-rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts (renamed from src/ts/contract_wrappers/exchange_wrapper.ts) | 2 | ||||
-rw-r--r-- | src/globals.d.ts (renamed from src/ts/globals.d.ts) | 0 | ||||
-rw-r--r-- | src/schemas/ec_signature_schema.ts (renamed from src/ts/schemas/ec_signature_schema.ts) | 0 | ||||
-rw-r--r-- | src/types.ts (renamed from src/ts/types.ts) | 0 | ||||
-rw-r--r-- | src/utils/assert.ts (renamed from src/ts/utils/assert.ts) | 0 | ||||
-rw-r--r-- | src/utils/constants.ts (renamed from src/ts/utils/constants.ts) | 0 | ||||
-rw-r--r-- | src/utils/schema_validator.ts (renamed from src/ts/utils/schema_validator.ts) | 0 | ||||
-rw-r--r-- | src/utils/utils.ts (renamed from src/ts/utils/utils.ts) | 0 | ||||
-rw-r--r-- | src/web3_wrapper.ts (renamed from src/ts/web3_wrapper.ts) | 0 | ||||
-rw-r--r-- | test/0x.js_test.ts | 4 | ||||
-rw-r--r-- | test/contract_wrapper_test.ts | 4 |
14 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index d83c1d095..5c352bc88 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "build:bundle": "webpack", "build:commonjs": "tsc; copyfiles -u 2 ./src/artifacts/*.json ../0x.js/lib/src/artifacts;", "build": "npm run clean && run-p build:*", - "lint": "tslint src/ts/**/*", + "lint": "tslint src/**/*.ts", "test": "run-s clean build:commonjs && mocha lib/test/**/*_test.js", "test:coverage": "nyc npm run test --all", "docs:json": "typedoc --json docs/index.json .", diff --git a/src/ts/0x.js.ts b/src/0x.js.ts index 1ebafc604..1ebafc604 100644 --- a/src/ts/0x.js.ts +++ b/src/0x.js.ts diff --git a/src/ts/contract_wrappers/contract_wrapper.ts b/src/contract_wrappers/contract_wrapper.ts index 9f4cd8039..9f4cd8039 100644 --- a/src/ts/contract_wrappers/contract_wrapper.ts +++ b/src/contract_wrappers/contract_wrapper.ts diff --git a/src/ts/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index 38043dd55..f9585e991 100644 --- a/src/ts/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -3,7 +3,7 @@ import {Web3Wrapper} from '../web3_wrapper'; import {ECSignature, ZeroExError, ExchangeContract} from '../types'; import {assert} from '../utils/assert'; import {ContractWrapper} from './contract_wrapper'; -import * as ExchangeArtifacts from '../../artifacts/Exchange.json'; +import * as ExchangeArtifacts from '../artifacts/Exchange.json'; import {ECSignatureSchema} from '../schemas/ec_signature_schema'; export class ExchangeWrapper extends ContractWrapper { diff --git a/src/ts/globals.d.ts b/src/globals.d.ts index dee957f2f..dee957f2f 100644 --- a/src/ts/globals.d.ts +++ b/src/globals.d.ts diff --git a/src/ts/schemas/ec_signature_schema.ts b/src/schemas/ec_signature_schema.ts index 94e58e53c..94e58e53c 100644 --- a/src/ts/schemas/ec_signature_schema.ts +++ b/src/schemas/ec_signature_schema.ts diff --git a/src/ts/types.ts b/src/types.ts index 4da03a4d3..4da03a4d3 100644 --- a/src/ts/types.ts +++ b/src/types.ts diff --git a/src/ts/utils/assert.ts b/src/utils/assert.ts index 1baf572d1..1baf572d1 100644 --- a/src/ts/utils/assert.ts +++ b/src/utils/assert.ts diff --git a/src/ts/utils/constants.ts b/src/utils/constants.ts index ec2fe744a..ec2fe744a 100644 --- a/src/ts/utils/constants.ts +++ b/src/utils/constants.ts diff --git a/src/ts/utils/schema_validator.ts b/src/utils/schema_validator.ts index bd2f97d2b..bd2f97d2b 100644 --- a/src/ts/utils/schema_validator.ts +++ b/src/utils/schema_validator.ts diff --git a/src/ts/utils/utils.ts b/src/utils/utils.ts index b514b702d..b514b702d 100644 --- a/src/ts/utils/utils.ts +++ b/src/utils/utils.ts diff --git a/src/ts/web3_wrapper.ts b/src/web3_wrapper.ts index 3b460e4da..3b460e4da 100644 --- a/src/ts/web3_wrapper.ts +++ b/src/web3_wrapper.ts diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts index 9c61c3e10..5dbb781ab 100644 --- a/test/0x.js_test.ts +++ b/test/0x.js_test.ts @@ -3,8 +3,8 @@ import * as chai from 'chai'; import 'mocha'; import * as BigNumber from 'bignumber.js'; import ChaiBigNumber = require('chai-bignumber'); -import {ZeroEx} from '../src/ts/0x.js'; -import {constants} from '../src/ts/utils/constants'; +import {ZeroEx} from '../src/0x.js'; +import {constants} from '../src/utils/constants'; // Use BigNumber chai add-on chai.use(ChaiBigNumber()); diff --git a/test/contract_wrapper_test.ts b/test/contract_wrapper_test.ts index 67dae3a4e..4ff56ea3e 100644 --- a/test/contract_wrapper_test.ts +++ b/test/contract_wrapper_test.ts @@ -3,9 +3,9 @@ import * as chai from 'chai'; import chaiAsPromised = require('chai-as-promised'); import * as Web3 from 'web3'; import {web3Factory} from './utils/web3_factory'; -import {ExchangeWrapper} from '../src/ts/contract_wrappers/exchange_wrapper'; +import {ExchangeWrapper} from '../src/contract_wrappers/exchange_wrapper'; import {BlockchainLifecycle} from './utils/blockchain_lifecycle'; -import {Web3Wrapper} from './../src/ts/web3_wrapper'; +import {Web3Wrapper} from './../src/web3_wrapper'; const expect = chai.expect; chai.use(chaiAsPromised); |