15087 Commits

Author SHA1 Message Date
Leonid Logvinov
843ec2d4cf
Remove spaces in types 2017-05-30 17:06:38 +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
Fabio Berger
141d23f78a Implement setProxyAllowanceAsync 2017-05-30 16:30:29 +02:00
Leonid Logvinov
90caa189cc
Add first passing test 2017-05-30 16:19:35 +02:00
Leonid Logvinov
a4e5ec6c08
Add isBigNumber argument assertion 2017-05-30 15:58:51 +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
Fabio Berger
b5e496ea0f Implement zeroEx.token.getProxyAllowanceAsync 2017-05-30 15:27:51 +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
Fabio Berger
2f16c54835 rename ERC20Contract to TokenContract 2017-05-30 14:49:29 +02:00
Leonid Logvinov
dfcf49464b
Temporarily remove test 2017-05-30 14:49:04 +02:00
Leonid Logvinov
8c0d783ccc
Add throwErrorLogsAsErrors 2017-05-30 14:48:45 +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
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
Leonid Logvinov
acd5fba133
Add order utils 2017-05-30 12:56:51 +02:00
Leonid Logvinov
76ddd12b4a
Fix order type 2017-05-30 12:56:28 +02:00
Leonid Logvinov
0b81cd9d78
Fix orderSchema 2017-05-30 12:56:11 +02:00
Fabio Berger
8561258ded Also test that web3Wrapper nested under tokenRegistryWrapper has updated provider 2017-05-30 12:56:10 +02:00
Leonid Logvinov
766d46041e
Add fillAmount parameter 2017-05-30 12:55:42 +02:00
Leonid Logvinov
968df3424c
Add copy_fixtures command 2017-05-30 12:55:00 +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
Leonid Logvinov
380c1e1ca5
Make fillOrderAsync accept signedOrder instead of a shit-ton of params 2017-05-30 12:17:43 +02:00
Leonid Logvinov
cf63e1d1a6
Change BigNumber schema to Number schema 2017-05-30 12:16:33 +02:00
Leonid Logvinov
170dd91bfd
Change BigNumber schema to Number schema 2017-05-30 12:13:30 +02:00