Review comments #1.

Author: easwars

xds/internal/resolver/xds_resolver_test.go

@@ -77,8 +77,8 @@ func (t *testClientConn) ParseServiceConfig(jsonSC string) *serviceconfig.ParseR
 
 func newTestClientConn() *testClientConn {
 	return &testClientConn{
-		stateCh: channel.NewChanWithTimeout(),
-		errorCh: channel.NewChanWithTimeout(),
+		stateCh: channel.NewChan(),
+		errorCh: channel.NewChan(),
 	}
 }
 

xds/internal/testutils/channel/channel.go

@@ -39,20 +39,17 @@ const (
 // WithTimeout wraps a generic channel and provides a timed receive operation.
 type WithTimeout struct {
 	ch chan interface{}
-	// RecvTimeout is the timeout duration for receive operations on the
-	// underlying channel.
-	RecvTimeout time.Duration
 }
 
 // Send sends value on the underlying channel.
 func (cwt *WithTimeout) Send(value interface{}) {
 	cwt.ch <- value
 }
 
-// Receive returns the value received on the underlying channel, or
-// ErrRecvTimeout if the operation times out.
-func (cwt *WithTimeout) Receive() (interface{}, error) {
-	timer := time.NewTimer(cwt.RecvTimeout)
+// TimedReceive returns the value received on the underlying channel, or
+// ErrRecvTimeout if timeout amount of time elapsed.
+func (cwt *WithTimeout) TimedReceive(timeout time.Duration) (interface{}, error) {
+	timer := time.NewTimer(timeout)
 	select {
 	case <-timer.C:
 		return nil, ErrRecvTimeout
@@ -62,15 +59,13 @@ func (cwt *WithTimeout) Receive() (interface{}, error) {
 	}
 }
 
-// NewChanWithTimeout makes a WithTimeout channel using the defaults.
-func NewChanWithTimeout() *WithTimeout {
-	return NewChan(DefaultRecvTimeout, DefaultBufferSize)
+// Receive returns the value received on the underlying channel, or
+// ErrRecvTimeout if DefaultRecvTimeout amount of time elapses.
+func (cwt *WithTimeout) Receive() (interface{}, error) {
+	return cwt.TimedReceive(DefaultRecvTimeout)
 }
 
-// NewChan makes a WithTimeout channel using the provided timeout and bufSize.
-func NewChan(timeout time.Duration, bufSize int) *WithTimeout {
-	return &WithTimeout{
-		ch:          make(chan interface{}, bufSize),
-		RecvTimeout: timeout,
-	}
+// NewChan returns a new WithTimeout channel.
+func NewChan() *WithTimeout {
+	return &WithTimeout{ch: make(chan interface{}, DefaultBufferSize)}
 }

xds/internal/testutils/fakeclient/xds.go

@@ -63,8 +63,8 @@ func (xdsC *XDS) Close() {
 // NewXDS returns a new fake xds client.
 func NewXDS() *XDS {
 	return &XDS{
-		suWatchCh:  channel.NewChanWithTimeout(),
-		closeCh:    channel.NewChanWithTimeout(),
-		suCancelCh: channel.NewChanWithTimeout(),
+		suWatchCh:  channel.NewChan(),
+		closeCh:    channel.NewChan(),
+		suCancelCh: channel.NewChan(),
 	}
 }