Simplify OrderbookSync constructor to take auth object

...instead of full instance of AuthenticatedClient
coinbase · Dec 25, 2017 · 481193e · 481193e
1 parent 9cc86d1
commit 481193e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/lib/orderbook_sync.js b/lib/orderbook_sync.js
@@ -1,25 +1,35 @@
 const WebsocketClient = require('./clients/websocket.js');
+const AuthenticatedClient = require('./clients/authenticated.js');
 const PublicClient = require('./clients/public.js');
 const Orderbook = require('./orderbook.js');
+const Utils = require('./utilities.js');
 
 // Orderbook syncing
 class OrderbookSync extends WebsocketClient {
   constructor(
     productIDs,
     apiURI = 'https://api.gdax.com',
     websocketURI = 'wss://ws-feed.gdax.com',
-    authenticatedClient = null,
+    auth = null,
     { heartbeat = false } = {}
   ) {
-    super(productIDs, websocketURI, authenticatedClient, { heartbeat });
+    super(productIDs, websocketURI, auth, { heartbeat });
     this.apiURI = apiURI;
-    this.authenticatedClient = authenticatedClient;
+    this.auth = Utils.checkAuth(auth);
 
     this._queues = {}; // []
     this._sequences = {}; // -1
     this._public_clients = {};
     this.books = {};
 
+    if (this.auth.secret) {
+      this._authenticatedClient = new AuthenticatedClient(
+        this.auth.key,
+        this.auth.secret,
+        this.auth.passphrase
+      );
+    }
+
     this.productIDs.forEach(productID => {
       this._queues[productID] = [];
       this._sequences[productID] = -2;
@@ -55,8 +65,8 @@ class OrderbookSync extends WebsocketClient {
     const bookLevel = 3;
     const args = { level: bookLevel };
 
-    if (this.authenticatedClient) {
-      this.authenticatedClient
+    if (this._authenticatedClient) {
+      this._authenticatedClient
         .getProductOrderBook(args, productID)
         .then(onData.bind(this))
         .catch(onError.bind(this));

diff --git a/tests/orderbook_sync.spec.js b/tests/orderbook_sync.spec.js
@@ -31,18 +31,13 @@ suite('OrderbookSync', () => {
     });
   });
 
-  test('passes authentication details to websocket (with AuthenticatedClient)', done => {
+  test('passes authentication details to websocket', done => {
     const server = testserver(++port, () => {
-      const authClient = new Gdax.AuthenticatedClient(
-        'suchkey',
-        'suchsecret',
-        'muchpassphrase'
-      );
       new Gdax.OrderbookSync(
         'BTC-USD',
         EXCHANGE_API_URL,
         'ws://localhost:' + port,
-        authClient
+        { key: 'suchkey', secret: 'suchsecret', passphrase: 'muchpassphrase' }
       );
     });
 
@@ -89,7 +84,7 @@ suite('OrderbookSync', () => {
     });
   });
 
-  test('emits a message event (with AuthenticatedClient)', done => {
+  test('emits a message event (with auth)', done => {
     nock(EXCHANGE_API_URL)
       .get('/products/BTC-USD/book?level=3')
       .times(2)
@@ -99,12 +94,11 @@ suite('OrderbookSync', () => {
       });
 
     const server = testserver(++port, () => {
-      const authClient = new Gdax.AuthenticatedClient('key', 'secret', 'pass');
       const orderbookSync = new Gdax.OrderbookSync(
         'BTC-USD',
         EXCHANGE_API_URL,
         'ws://localhost:' + port,
-        authClient
+        { key: 'key', secret: 'secret', passphrase: 'pass' }
       );
       orderbookSync.on('message', data => {
         assert.deepEqual(data, {
@@ -147,18 +141,17 @@ suite('OrderbookSync', () => {
     });
   });
 
-  test('emits an error event on error (with AuthenticatedClient)', done => {
+  test('emits an error event on error (with auth)', done => {
     nock(EXCHANGE_API_URL)
       .get('/products/BTC-USD/book?level=3')
       .replyWithError('whoops');
 
     const server = testserver(++port, () => {
-      const authClient = new Gdax.AuthenticatedClient('key', 'secret', 'pass');
       const orderbookSync = new Gdax.OrderbookSync(
         'BTC-USD',
         EXCHANGE_API_URL,
         'ws://localhost:' + port,
-        authClient
+        { key: 'key', secret: 'secret', passphrase: 'pass' }
       );
 
       orderbookSync.on('message', () =>