Fabio Berger d907b40378 Fix remaining merge issues

2018-08-22 13:12:42 +01:00

..

utils

Fix tests

2018-07-05 19:11:41 +02:00

artifacts_test.ts

Add a TODO comment

2018-06-29 17:52:54 +03:00

calldata_optimization_utils_test.ts

Fix additional merge conflicts

2018-08-14 14:39:59 -07:00

erc20_proxy_wrapper_test.ts

Refactor ERC20 token transfer proxy and it's tests

2018-06-29 17:52:53 +03:00

erc20_wrapper_test.ts

Cleanup contract-wrappers index.ts

2018-08-20 13:49:29 +01:00

erc721_proxy_wrapper_test.ts

Make promises dangerous

2018-06-29 17:52:54 +03:00

erc721_wrapper_test.ts

Cleanup contract-wrappers index.ts

2018-08-20 13:49:29 +01:00

ether_token_wrapper_test.ts

Cleanup contract-wrappers index.ts

2018-08-20 13:49:29 +01:00

exchange_wrapper_test.ts

Cleanup contract-wrappers index.ts

2018-08-20 13:49:29 +01:00

forwarder_wrapper_test.ts

Cleanup contract-wrappers index.ts

2018-08-20 13:49:29 +01:00

global_hooks.ts

remove v2 contract artifacts

2018-08-20 16:12:09 -04:00

subscription_test.ts

Cleanup contract-wrappers index.ts

2018-08-20 13:49:29 +01:00

transaction_encoder_test.ts

Fix remaining merge issues

2018-08-22 13:12:42 +01:00