Commit Graph

198 Commits

Author SHA1 Message Date
Fabio Berger
2c3b718a4f rename erc20Wrapper to tokenWrapper to be more generic in case we end up supporting another spec 2017-05-30 14:48:41 +02:00
Fabio Berger
1f09470838 Merge branch 'master' into erc20Wrapper
# Conflicts:
#	src/0x.js.ts
2017-05-30 14:48:10 +02:00
Fabio Berger
6b321ca1c7 Remove mention of internal cleanup from public comment 2017-05-30 14:34:23 +02:00
Leonid
b0436a4f67 Merge pull request #25 from 0xProject/dontReinstantiateContractInstances
Add zeroEx.setProvider and clear contractInstances created with old provider
2017-05-30 14:31:37 +02:00
Fabio Berger
3522f94ff6 use .be.undefined instead of .be.an('undefined') 2017-05-30 14:26:07 +02:00
Fabio Berger
ad14c307ce Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that instantiates contract instance if not already instantiated 2017-05-30 14:23:44 +02:00
Fabio Berger
8561258ded Also test that web3Wrapper nested under tokenRegistryWrapper has updated provider 2017-05-30 12:56:10 +02:00
Fabio Berger
eefc8ca7ec add assertions that contractInstances are not undefined before provider update 2017-05-30 12:53:42 +02:00
Fabio Berger
007c57ec40 Also instantiate tokenRegistry contract instance 2017-05-30 12:52:28 +02:00
Fabio Berger
6aded80b2f remove unused import 2017-05-30 12:51:34 +02:00
Fabio Berger
3d3297834c remove unused declarations 2017-05-30 12:50:29 +02:00
Fabio Berger
f78f3b1bcd remove unused import 2017-05-30 12:48:46 +02:00
Fabio Berger
e2d0fd9cf9 remove unused import 2017-05-30 12:47:53 +02:00
Fabio Berger
b837021e6e improve comment 2017-05-30 12:47:46 +02:00
Fabio Berger
a3ce892f85 Make tokenRegistry contract instantiation lazy and clear it on provider update 2017-05-30 12:43:50 +02:00
Fabio Berger
cb31b21d28 rename invalidateExchangeContract to invalidateContractInstance 2017-05-30 12:43:06 +02:00
Fabio Berger
e8a52ce1da Merge branch 'master' into dontReinstantiateContractInstances 2017-05-30 12:37:45 +02:00
Fabio Berger
911ab437b8 Merge pull request #24 from 0xProject/tokenRegistry
TokenRegistryWrapper
2017-05-30 12:37:25 +02:00
Fabio Berger
02d7f808ab Merge branch 'master' into tokenRegistry
# Conflicts:
#	src/0x.js.ts
2017-05-30 12:36:28 +02:00
Fabio Berger
73ae3df172 Merge pull request #22 from 0xProject/regex-fix
Fix the empty code regex
2017-05-30 12:32:13 +02:00
Fabio Berger
d15002a110 Add tests for setProvider 2017-05-30 12:30:38 +02:00
Fabio Berger
55b00ab380 Add setProvider method to 0x.js that updates the web3 provider and invalidates any contractInstances instantiated with the old provider 2017-05-30 12:28:07 +02:00
Fabio Berger
87491e6741 Lazily instantiate exchangeContract and store as instance variable instead of re-instantiating on every call 2017-05-30 12:27:27 +02:00
Fabio Berger
c536114b16 make web3Wrapper a private instance variable 2017-05-30 12:25:17 +02:00
Fabio Berger
4d63a4d02a use to.have.lengthOf 2017-05-30 10:49:34 +02:00
Fabio Berger
1e69d2d1e1 Improve type definitions 2017-05-30 10:48:34 +02:00
Fabio Berger
f2cd368a49 Add TokenMetadata type 2017-05-30 10:42:39 +02:00
Leonid Logvinov
220f925415 Fix the empty code regex 2017-05-30 10:21:48 +02:00
Fabio Berger
5bfc3f8976 remove unused import 2017-05-30 10:19:29 +02:00
Leonid
1f6ed77f47 Merge pull request #20 from 0xProject/removeSrcFilesNotUsedByTests
Allow tests to access schemas, utils and types
2017-05-30 10:12:54 +02:00
Fabio Berger
f4bc7ecf5f Merge branch 'tokenRegistry' into erc20Wrapper 2017-05-30 09:55:52 +02:00
Fabio Berger
b21779999f Merge branch 'removeSrcFilesNotUsedByTests' into tokenRegistry 2017-05-30 09:55:15 +02:00
Fabio Berger
ec379cc350 Merge branch 'master' into removeSrcFilesNotUsedByTests 2017-05-30 09:54:52 +02:00
Fabio Berger
c9111aea38 name exchangeWrapper test file properly 2017-05-30 09:54:11 +02:00
Fabio Berger
000e364406 Reverts: 7e96b45ea0 which broke this regex for the 0x0 edge-case 2017-05-30 09:53:55 +02:00
Fabio Berger
132b5d4f9b Add tests for getBalanceAsync 2017-05-30 09:52:47 +02:00
Fabio Berger
6686443317 Implement ERC20Wrapper and it's first method getBalanceAsync 2017-05-30 09:52:31 +02:00
Fabio Berger
f3d5690d56 Add tests for getTokensAsync including schema validation 2017-05-29 23:52:10 +02:00
Fabio Berger
919585cd79 Add TokenRegistryWrapper and getTokensAsync method 2017-05-29 23:51:27 +02:00
Fabio Berger
6cb9bd4426 Instead of removing all files from ./lib/src for the UMD test, we leave the utils and schema folders as well as the types file since they are used by the test files 2017-05-29 23:21:38 +02:00
Fabio Berger
7b9e8777f1 Merge pull request #19 from 0xProject/test-commands-refactor
Refactor test commands
2017-05-29 19:25:53 +02:00
Leonid
c820e873f1 Merge branch 'master' into test-commands-refactor 2017-05-29 19:16:49 +02:00
Leonid
f4047dbe18 Merge pull request #18 from 0xProject/fix-coverage
Run coverage only for commonjs test
2017-05-29 19:14:51 +02:00
Leonid Logvinov
66e4f5e5a4 Refactor test commands 2017-05-29 19:02:11 +02:00
Fabio Berger
46fb1914cf Lowercase schema names 2017-05-29 18:13:07 +02:00
Fabio Berger
43082b576c Fix typos 2017-05-29 16:53:07 +02:00
Fabio Berger
041394e652 Merge pull request #17 from 0xProject/addSignOrderHashAndTests
Add signOrderHashAsync and tests
2017-05-29 16:32:32 +02:00
Fabio Berger
1958142936 empty stubs array before next test runs 2017-05-29 16:10:34 +02:00
Fabio Berger
9008dfdcb1 improve comment 2017-05-29 16:10:20 +02:00
Fabio Berger
c513a5a5bd Merge branch 'master' into addSignOrderHashAndTests
# Conflicts:
#	package.json
#	src/globals.d.ts
#	test/0x.js_test.ts
2017-05-29 16:06:04 +02:00