aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-08 00:14:35 +0800
committerFabio Berger <me@fabioberger.com>2018-06-08 00:14:35 +0800
commit4f4acc04fe6a732b0c241cc9a37b59179d981769 (patch)
treec0f8625408db6e2c1caa359b08e60332f5f06b83
parentbd3b652cfca6258055ba52eae198dd2302f0c956 (diff)
downloaddexon-sol-tools-4f4acc04fe6a732b0c241cc9a37b59179d981769.tar
dexon-sol-tools-4f4acc04fe6a732b0c241cc9a37b59179d981769.tar.gz
dexon-sol-tools-4f4acc04fe6a732b0c241cc9a37b59179d981769.tar.bz2
dexon-sol-tools-4f4acc04fe6a732b0c241cc9a37b59179d981769.tar.lz
dexon-sol-tools-4f4acc04fe6a732b0c241cc9a37b59179d981769.tar.xz
dexon-sol-tools-4f4acc04fe6a732b0c241cc9a37b59179d981769.tar.zst
dexon-sol-tools-4f4acc04fe6a732b0c241cc9a37b59179d981769.zip
Fix missing paths
-rw-r--r--.prettierignore4
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/contracts/test/asset_proxy/proxies.ts8
3 files changed, 7 insertions, 7 deletions
diff --git a/.prettierignore b/.prettierignore
index f78ea1034..108c167b8 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,9 +1,9 @@
lib
.nyc_output
-/packages/0x.js/src/contract_wrappers/generated/
-/packages/contracts/src/contract_wrappers/generated/
/packages/contract-wrappers/src/contract_wrappers/generated/
/packages/metacoin/src/contract_wrappers
+/packages/0x.js/src/generated_contract_wrappers/
+/packages/contracts/src/generated_contract_wrappers/
/packages/fill-scenarios/src/generated_contract_wrappers/
/packages/order-watcher/src/generated_contract_wrappers/
/packages/order-utils/src/generated_contract_wrappers/
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 6dcd1b862..77c57645d 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -21,7 +21,7 @@
"pre_build": "run-s generate_contract_wrappers copy_artifacts",
"copy_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts",
"generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
- "lint": "tslint --project . --exclude **/src/contract_wrappers/generated/**/*",
+ "lint": "tslint --project . --exclude **/src/generated_contract_wrapper/**/*",
"test:circleci": "run-s test:coverage",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s build test",
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts
index bf2aa8f70..d14280c5f 100644
--- a/packages/contracts/test/asset_proxy/proxies.ts
+++ b/packages/contracts/test/asset_proxy/proxies.ts
@@ -4,10 +4,10 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import * as _ from 'lodash';
-import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/generated/dummy_e_r_c20_token';
-import { DummyERC721TokenContract } from '../../src/generated_contract_wrappers/generated/dummy_e_r_c721_token';
-import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/generated/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/generated/e_r_c721_proxy';
+import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c20_token';
+import { DummyERC721TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c721_token';
+import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c20_proxy';
+import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/e_r_c721_proxy';
import { expectRevertOrAlwaysFailingTransactionAsync } from '../../src/utils/assertions';
import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants';