From 756b82b370276ed165d803d191effb54fce04458 Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Wed, 6 May 2015 10:28:47 -0300
Subject: [PATCH] update websocket app

---
 lib/server.js              |  5 -----
 lib/wsapp.js               | 21 ++++++---------------
 test/integration/server.js |  1 -
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index 1fcd977..36c6130 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -17,7 +17,6 @@ var Utils = require('./utils');
 var Lock = require('./lock');
 var Storage = require('./storage');
 var MessageBroker = require('./messagebroker');
-var NotificationBroadcaster = require('./notificationbroadcaster');
 var BlockchainExplorer = require('./blockchainexplorer');
 
 var Wallet = require('./model/wallet');
@@ -47,10 +46,6 @@ function WalletService() {
   this.notifyTicker = 0;
 };
 
-WalletService.onNotification = function(func) {
-  NotificationBroadcaster.on('notification', func);
-};
-
 /**
  * Initializes global settings for all instances.
  * @param {Object} opts
diff --git a/lib/wsapp.js b/lib/wsapp.js
index d424932..d4fb026 100644
--- a/lib/wsapp.js
+++ b/lib/wsapp.js
@@ -8,12 +8,11 @@ log.debug = log.verbose;
 var Uuid = require('uuid');
 
 var WalletService = require('./server');
-
-var Notification = require('./model/notification');
+var MessageBroker = require('./messagebroker');
 
 log.level = 'debug';
 
-var io, messageQueue;
+var io, messageBroker;
 
 var WsApp = function() {};
 
@@ -28,24 +27,16 @@ WsApp._handleNotification = function(notification) {
 
 WsApp.start = function(server, opts, cb) {
   opts = opts || {};
-  $.checkState(opts.messageQueueOpts);
+  $.checkState(opts.messageBrokerOpts);
 
   io = require('socket.io')(server);
 
   async.series([
 
     function(done) {
-      messageQueue = require('socket.io-client').connect(opts.messageQueueOpts.url, {
-        'force new connection': true,
-      });
-      messageQueue.on('connect_error', function(err) {
-        log.warn('Could not connect to message queue server');
-      });
-      messageQueue.on('notification', WsApp._handleNotification);
-
-      messageQueue.on('connect', function() {
-        done();
-      });
+      messageBroker = new MessageBroker(opts.messageBrokerOpts);
+      messageBroker.onMessage(WsApp._handleNotification);
+      done();
     },
     function(done) {
       io.on('connection', function(socket) {
diff --git a/test/integration/server.js b/test/integration/server.js
index 5d05111..bb8506a 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -28,7 +28,6 @@ var Address = Model.Address;
 var Copayer = Model.Copayer;
 
 var WalletService = require('../../lib/server');
-var NotificationBroadcaster = require('../../lib/notificationbroadcaster');
 var TestData = require('../testdata');
 
 var helpers = {};