From b10ce88d302e8b06475caf221d7aaaa3808f2a7f Mon Sep 17 00:00:00 2001
From: Chuntao Lu <clu@uber.com>
Date: Mon, 3 Apr 2017 12:54:06 -0700
Subject: [PATCH] Allocate only one top channel

---
 runtime/gateway.go         | 8 --------
 runtime/tchannel_server.go | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/runtime/gateway.go b/runtime/gateway.go
index 9dbb403b3..320892079 100644
--- a/runtime/gateway.go
+++ b/runtime/gateway.go
@@ -356,14 +356,6 @@ func (gateway *Gateway) setupHTTPServer() error {
 }
 
 func (gateway *Gateway) setupTChannel(config *StaticConfig) error {
-	// TODO: (lu) channel name and opts
-	ch, err := tchannel.NewChannel("Gateway", nil)
-	if err != nil {
-		return err
-	}
-
-	gateway.Channel = ch
-
 	tchannelServer, err := NewTChannelServer(
 		&TChannelServerOptions{
 			ServiceName: config.MustGetString("tchannel.serviceName"),
diff --git a/runtime/tchannel_server.go b/runtime/tchannel_server.go
index c34af6c5b..6f26e1b52 100644
--- a/runtime/tchannel_server.go
+++ b/runtime/tchannel_server.go
@@ -68,5 +68,7 @@ func NewTChannelServer(opts *TChannelServerOptions, gateway *Gateway) (*zt.Serve
 			err)
 	}
 
+	gateway.Channel = channel
+
 	return zt.NewServer(channel, gateway.Logger), nil
 }