Merge branch 'master' into addEventSubscriptions

# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
#	src/types.ts
#	test/exchange_wrapper_test.ts

1 files changed, 24 insertions, 0 deletions

diff --git a/test/utils/token_utils.ts b/test/utils/token_utils.ts
new file mode 100644
index 000000000..14788b299
--- /dev/null
+++ b/test/utils/token_utils.ts
@@ -0,0 +1,24 @@
+import * as _ from 'lodash';
+import {Token, ZeroExError} from '../../src/types';
+
+const PROTOCOL_TOKEN_SYMBOL = 'ZRX';
+
+export class TokenUtils {
+    private tokens: Token[];
+    constructor(tokens: Token[]) {
+        this.tokens = tokens;
+    }
+    public getProtocolTokenOrThrow(): Token {
+        const zrxToken = _.find(this.tokens, {symbol: PROTOCOL_TOKEN_SYMBOL});
+        if (_.isUndefined(zrxToken)) {
+            throw new Error(ZeroExError.ZRX_NOT_IN_TOKEN_REGISTRY);
+        }
+        return zrxToken;
+    }
+    public getNonProtocolTokens(): Token[] {
+        const nonProtocolTokens = _.filter(this.tokens, token => {
+            return token.symbol !== PROTOCOL_TOKEN_SYMBOL;
+        });
+        return nonProtocolTokens;
+    }
+}