From 387363283ca03ac1d6c9be5b7be2107790bbf79d Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 22 Jan 2018 21:53:32 +0100
Subject: Remove truffle from tests

---
 packages/0x.js/src/0x.ts | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'packages/0x.js/src/0x.ts')

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index f8a484c5d..8eb8cdd9a 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -1,5 +1,6 @@
 import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { BigNumber, intervalUtils } from '@0xproject/utils';
+import { TransactionReceiptWithDecodedLogs } from '@0xproject/types';
+import { AbiDecoder, BigNumber, intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
@@ -12,16 +13,7 @@ import { TokenTransferProxyWrapper } from './contract_wrappers/token_transfer_pr
 import { TokenWrapper } from './contract_wrappers/token_wrapper';
 import { OrderStateWatcher } from './order_watcher/order_state_watcher';
 import { zeroExConfigSchema } from './schemas/zero_ex_config_schema';
-import {
-    ECSignature,
-    Order,
-    SignedOrder,
-    TransactionReceiptWithDecodedLogs,
-    Web3Provider,
-    ZeroExConfig,
-    ZeroExError,
-} from './types';
-import { AbiDecoder } from './utils/abi_decoder';
+import { ECSignature, Order, SignedOrder, Web3Provider, ZeroExConfig, ZeroExError } from './types';
 import { assert } from './utils/assert';
 import { constants } from './utils/constants';
 import { decorators } from './utils/decorators';
@@ -293,18 +285,18 @@ export class ZeroEx {
      * @param   timeoutMs         How long (in ms) to poll for transaction mined until aborting.
      * @return  Transaction receipt with decoded log args.
      */
-    public async awaitTransactionMinedAsync(
+    public async awaitTransactionMinedAsync<ArgsType>(
         txHash: string,
         pollingIntervalMs = 1000,
         timeoutMs?: number,
-    ): Promise<TransactionReceiptWithDecodedLogs> {
+    ): Promise<TransactionReceiptWithDecodedLogs<ArgsType>> {
         let timeoutExceeded = false;
         if (timeoutMs) {
             setTimeout(() => (timeoutExceeded = true), timeoutMs);
         }
 
         const txReceiptPromise = new Promise(
-            (resolve: (receipt: TransactionReceiptWithDecodedLogs) => void, reject) => {
+            (resolve: (receipt: TransactionReceiptWithDecodedLogs<ArgsType>) => void, reject) => {
                 const intervalId = intervalUtils.setAsyncExcludingInterval(
                     async () => {
                         if (timeoutExceeded) {
@@ -319,7 +311,7 @@ export class ZeroEx {
                                 transactionReceipt.logs,
                                 this._abiDecoder.tryToDecodeLogOrNoop.bind(this._abiDecoder),
                             );
-                            const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = {
+                            const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs<ArgsType> = {
                                 ...transactionReceipt,
                                 logs: logsWithDecodedArgs,
                             };
@@ -334,8 +326,8 @@ export class ZeroEx {
                 );
             },
         );
-
-        return txReceiptPromise;
+        const txReceipt = await txReceiptPromise;
+        return txReceipt;
     }
     /*
      * HACK: `TokenWrapper` needs a token transfer proxy address. `TokenTransferProxy` address is fetched from
-- 
cgit 


From a17091b394400ae13b7f85632b2c4a2e20935442 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 22 Jan 2018 22:19:29 +0100
Subject: Make awaitTransactionMinedAsync non-generic again

---
 packages/0x.js/src/0x.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/0x.js/src/0x.ts')

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 8eb8cdd9a..6cfa65cc2 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -285,18 +285,18 @@ export class ZeroEx {
      * @param   timeoutMs         How long (in ms) to poll for transaction mined until aborting.
      * @return  Transaction receipt with decoded log args.
      */
-    public async awaitTransactionMinedAsync<ArgsType>(
+    public async awaitTransactionMinedAsync(
         txHash: string,
         pollingIntervalMs = 1000,
         timeoutMs?: number,
-    ): Promise<TransactionReceiptWithDecodedLogs<ArgsType>> {
+    ): Promise<TransactionReceiptWithDecodedLogs> {
         let timeoutExceeded = false;
         if (timeoutMs) {
             setTimeout(() => (timeoutExceeded = true), timeoutMs);
         }
 
         const txReceiptPromise = new Promise(
-            (resolve: (receipt: TransactionReceiptWithDecodedLogs<ArgsType>) => void, reject) => {
+            (resolve: (receipt: TransactionReceiptWithDecodedLogs) => void, reject) => {
                 const intervalId = intervalUtils.setAsyncExcludingInterval(
                     async () => {
                         if (timeoutExceeded) {
@@ -311,7 +311,7 @@ export class ZeroEx {
                                 transactionReceipt.logs,
                                 this._abiDecoder.tryToDecodeLogOrNoop.bind(this._abiDecoder),
                             );
-                            const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs<ArgsType> = {
+                            const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = {
                                 ...transactionReceipt,
                                 logs: logsWithDecodedArgs,
                             };
-- 
cgit