Commit Graph

233 Commits

Author SHA1 Message Date
Leonid Logvinov
1955e90bbb Fix linter errors 2017-05-31 16:15:16 +02:00
Leonid Logvinov
7d29fb2174 Remove debug output 2017-05-31 16:06:14 +02:00
Leonid Logvinov
84c652d205 Revert tests 2017-05-31 16:03:16 +02:00
Leonid Logvinov
7f269cd791 Add createSignedOrder function 2017-05-31 16:03:06 +02:00
Leonid Logvinov
454c045838 Merge branch 'erc20transfer' into fillOrderAsync 2017-05-31 12:10:38 +02:00
Leonid Logvinov
9409e0aba1 Add transfer function and tests for it 2017-05-31 11:16:57 +02:00
Leonid Logvinov
be13cf127c Refactor getOrderHash to accept order as an object 2017-05-30 17:35:17 +02:00
Leonid Logvinov
68f39765aa Remove fixture 2017-05-30 17:05:29 +02:00
Fabio Berger
5e6818d3ef remove unused imports 2017-05-30 16:36:38 +02:00
Fabio Berger
8df2926a1a Add test for setProxyAllowanceAsync and additional test for getProxyAllowanceAsync 2017-05-30 16:31:02 +02:00
Leonid Logvinov
90caa189cc Add first passing test 2017-05-30 16:19:35 +02:00
Leonid Logvinov
18d6b3b86f replace test fixture with the one from testrpc 2017-05-30 15:57:22 +02:00
Fabio Berger
f066b52143 remove spaces after it keyword 2017-05-30 15:28:45 +02:00
Fabio Berger
53e83a7d81 Add first test for getProxyAllowanceAsync 2017-05-30 15:28:21 +02:00
Leonid Logvinov
be4248f345 Fix import 2017-05-30 14:59:24 +02:00
Leonid Logvinov
3e65ac018c Merge branch 'master' into fillOrderAsync 2017-05-30 14:55:43 +02:00
Fabio Berger
86cdb6cb83 use token instead of erc20 2017-05-30 14:53:25 +02:00
Leonid Logvinov
dfcf49464b Temporarily remove test 2017-05-30 14:49:04 +02:00
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
Leonid Logvinov
18d65f5f55 Append _test to exchange_wrapper 2017-05-30 14:36:14 +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
Leonid Logvinov
acd5fba133 Add order utils 2017-05-30 12:56:51 +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
e2d0fd9cf9 remove unused import 2017-05-30 12:47:53 +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
e8a52ce1da Merge branch 'master' into dontReinstantiateContractInstances 2017-05-30 12:37:45 +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
d15002a110 Add tests for setProvider 2017-05-30 12:30:38 +02:00
Fabio Berger
c536114b16 make web3Wrapper a private instance variable 2017-05-30 12:25:17 +02:00
Leonid Logvinov
72e3b0e290 Add first order fixture 2017-05-30 12:01:47 +02:00
Fabio Berger
4d63a4d02a use to.have.lengthOf 2017-05-30 10:49:34 +02:00
Leonid Logvinov
cda040ef99 Merge branch 'master' into fillOrderAsync 2017-05-30 10:24:45 +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
c9111aea38 name exchangeWrapper test file properly 2017-05-30 09:54:11 +02:00
Fabio Berger
132b5d4f9b Add tests for getBalanceAsync 2017-05-30 09:52:47 +02:00
Fabio Berger
f3d5690d56 Add tests for getTokensAsync including schema validation 2017-05-29 23:52:10 +02:00
Leonid Logvinov
9bb738bb2f Finish ecSignature renaming 2017-05-29 22:45:05 +02:00
Fabio Berger
43082b576c Fix typos 2017-05-29 16:53:07 +02:00
Fabio Berger
1958142936 empty stubs array before next test runs 2017-05-29 16:10:34 +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
Fabio Berger
abd0228ba8 Merge pull request #16 from 0xProject/umd-tests
Umd tests
2017-05-29 16:04:13 +02:00
Fabio Berger
a331943c11 Use disable-next-line instead of disable and always put rule that is being disabled 2017-05-29 15:59:42 +02:00
Fabio Berger
8c877bb18a Implement tests for signOrderHashAsync that test the logic for Parity < v1.6.6, >1.6.6 and other nodes 2017-05-29 13:39:32 +02:00
Fabio Berger
232e031959 don't use uppercase for constant variable unless it's global to the entire file 2017-05-29 13:34:49 +02:00