From 1154df9a4e0958aea682a1b9eef3f9a14138763f Mon Sep 17 00:00:00 2001
From: Doug Fawley <dfawley@google.com>
Date: Thu, 16 Jul 2020 13:20:46 -0700
Subject: [PATCH] balancer: remove deprecated type aliases as planned (#3742)

---
 balancer/balancer.go                                  | 10 ----------
 balancer/base/base.go                                 | 11 -----------
 balancer/rls/internal/balancer.go                     |  6 +++---
 xds/internal/balancer/cdsbalancer/cdsbalancer_test.go |  1 -
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/balancer/balancer.go b/balancer/balancer.go
index e75b2843604..8bf359dbfda 100644
--- a/balancer/balancer.go
+++ b/balancer/balancer.go
@@ -312,16 +312,6 @@ type Balancer interface {
 	Close()
 }
 
-// V2Balancer is temporarily defined for backward compatibility reasons.
-//
-// Deprecated: use Balancer directly instead.
-type V2Balancer = Balancer
-
-// V2Picker is temporarily defined for backward compatibility reasons.
-//
-// Deprecated: use Picker directly instead.
-type V2Picker = Picker
-
 // SubConnState describes the state of a SubConn.
 type SubConnState struct {
 	// ConnectivityState is the connectivity state of the SubConn.
diff --git a/balancer/base/base.go b/balancer/base/base.go
index c4fc89111bf..e31d76e338a 100644
--- a/balancer/base/base.go
+++ b/balancer/base/base.go
@@ -69,14 +69,3 @@ func NewBalancerBuilder(name string, pb PickerBuilder, config Config) balancer.B
 		config:        config,
 	}
 }
-
-// NewBalancerBuilderV2 is temporarily defined for backward compatibility
-// reasons.
-//
-// Deprecated: use NewBalancerBuilder instead.
-var NewBalancerBuilderV2 = NewBalancerBuilder
-
-// V2PickerBuilder is temporarily defined for backward compatibility reasons.
-//
-// Deprecated: use PickerBuilder instead.
-type V2PickerBuilder = PickerBuilder
diff --git a/balancer/rls/internal/balancer.go b/balancer/rls/internal/balancer.go
index 968e8e9310d..aeb509aa894 100644
--- a/balancer/rls/internal/balancer.go
+++ b/balancer/rls/internal/balancer.go
@@ -97,7 +97,7 @@ func (lb *rlsBalancer) handleClientConnUpdate(ccs *balancer.ClientConnState) {
 
 // UpdateClientConnState pushes the received ClientConnState update on the
 // update channel which will be processed asynchronously by the run goroutine.
-// Implements balancer.V2Balancer interface.
+// Implements balancer.Balancer interface.
 func (lb *rlsBalancer) UpdateClientConnState(ccs balancer.ClientConnState) error {
 	select {
 	case lb.ccUpdateCh <- &ccs:
@@ -106,14 +106,14 @@ func (lb *rlsBalancer) UpdateClientConnState(ccs balancer.ClientConnState) error
 	return nil
 }
 
-// ResolverErr implements balancer.V2Balancer interface.
+// ResolverErr implements balancer.Balancer interface.
 func (lb *rlsBalancer) ResolverError(error) {
 	// ResolverError is called by gRPC when the name resolver reports an error.
 	// TODO(easwars): How do we handle this?
 	logger.Fatal("rls: ResolverError is not yet unimplemented")
 }
 
-// UpdateSubConnState implements balancer.V2Balancer interface.
+// UpdateSubConnState implements balancer.Balancer interface.
 func (lb *rlsBalancer) UpdateSubConnState(_ balancer.SubConn, _ balancer.SubConnState) {
 	logger.Fatal("rls: UpdateSubConnState is not yet implemented")
 }
diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
index 31e56c1449e..358e6c3895e 100644
--- a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
+++ b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
@@ -231,7 +231,6 @@ func edsCCS(service string, enableLRS bool, xdsClient interface{}) balancer.Clie
 func setup() (*cdsBalancer, *testEDSBalancer, *testClientConn, func()) {
 	builder := cdsBB{}
 	tcc := newTestClientConn()
-	// cdsB := builder.Build(tcc, balancer.BuildOptions{}).(balancer.V2Balancer)
 	cdsB := builder.Build(tcc, balancer.BuildOptions{})
 
 	edsB := newTestEDSBalancer()