From 47901afbfa7b0e8e652b2c172f192f9060ee2ec6 Mon Sep 17 00:00:00 2001
From: Jeff Wolski <wolski@uber.com>
Date: Wed, 30 Sep 2015 13:16:33 -0700
Subject: [PATCH] Renamed legacy name RingPopTChannel to RingpopServer

---
 index.js        | 4 ++--
 server/index.js | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/index.js b/index.js
index 4965f2e1..13278b28 100644
--- a/index.js
+++ b/index.js
@@ -49,7 +49,6 @@ var Config = require('./config.js');
 var createEventForwarder = require('./lib/event-forwarder.js');
 var createMembershipSetListener = require('./lib/membership-set-listener.js');
 var createMembershipUpdateListener = require('./lib/membership-update-listener.js');
-var createServer = require('./server');
 var Dissemination = require('./lib/dissemination.js');
 var errors = require('./lib/errors.js');
 var getTChannelVersion = require('./lib/util.js').getTChannelVersion;
@@ -60,6 +59,7 @@ var MembershipUpdateRollup = require('./lib/membership/rollup.js');
 var nulls = require('./lib/nulls');
 var rawHead = require('./lib/request-proxy/util.js').rawHead;
 var RequestProxy = require('./lib/request-proxy/index.js');
+var RingpopServer = require('./server');
 var safeParse = require('./lib/util').safeParse;
 var sendJoin = require('./lib/swim/join-sender.js').joinCluster;
 var TracerStore = require('./lib/trace/store.js');
@@ -218,7 +218,7 @@ RingPop.prototype.destroy = function destroy() {
 };
 
 RingPop.prototype.setupChannel = function setupChannel() {
-    createServer(this, this.channel);
+    this.server = new RingpopServer(this, this.channel);
 };
 
 /*
diff --git a/server/index.js b/server/index.js
index 13cd78d2..0d76cc1d 100644
--- a/server/index.js
+++ b/server/index.js
@@ -20,7 +20,7 @@
 'use strict';
 
 
-function RingPopTChannel(ringpop, tchannel) {
+function RingpopServer(ringpop, tchannel) {
     var self = this;
     self.ringpop = ringpop;
     self.tchannel = tchannel;
@@ -63,8 +63,4 @@ function RingPopTChannel(ringpop, tchannel) {
     }
 }
 
-function createServer(ringpop, tchannel) {
-    return new RingPopTChannel(ringpop, tchannel);
-}
-
-module.exports = createServer;
+module.exports = RingpopServer;