From 0115f0029001f819c802594965ba25c082f04f9c Mon Sep 17 00:00:00 2001 From: Easwar Swaminathan Date: Fri, 30 Aug 2019 02:00:00 +0000 Subject: [PATCH] Make vet happy. --- clientconn_test.go | 6 +++--- dialoptions.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clientconn_test.go b/clientconn_test.go index ee6ed454d0d..6402fb3b511 100644 --- a/clientconn_test.go +++ b/clientconn_test.go @@ -663,7 +663,7 @@ func (s) TestWithBackoffConfig(t *testing.T) { b := BackoffConfig{MaxDelay: DefaultBackoffConfig.MaxDelay / 2} bc := grpcbackoff.DefaultConfig bc.MaxDelay = b.MaxDelay - wantBackoff := backoff.Exponential{bc} + wantBackoff := backoff.Exponential{Config: bc} testBackoffConfigSet(t, wantBackoff, WithBackoffConfig(b)) } @@ -671,7 +671,7 @@ func (s) TestWithBackoffMaxDelay(t *testing.T) { md := DefaultBackoffConfig.MaxDelay / 2 bc := grpcbackoff.DefaultConfig bc.MaxDelay = md - wantBackoff := backoff.Exponential{bc} + wantBackoff := backoff.Exponential{Config: bc} testBackoffConfigSet(t, wantBackoff, WithBackoffMaxDelay(md)) } @@ -684,7 +684,7 @@ func (s) TestWithConnectParams(t *testing.T) { crt := ConnectParams{Backoff: bc} // MaxDelay is not set in the ConnectParams. So it should not be set on // backoff.Exponential as well. - wantBackoff := backoff.Exponential{bc} + wantBackoff := backoff.Exponential{Config: bc} testBackoffConfigSet(t, wantBackoff, WithConnectParams(crt)) } diff --git a/dialoptions.go b/dialoptions.go index 5143fa207ee..d4222773391 100644 --- a/dialoptions.go +++ b/dialoptions.go @@ -252,7 +252,7 @@ func WithServiceConfig(c <-chan ServiceConfig) DialOption { // This API is EXPERIMENTAL. func WithConnectParams(p ConnectParams) DialOption { return newFuncDialOption(func(o *dialOptions) { - o.bs = backoff.Exponential{p.Backoff} + o.bs = backoff.Exponential{Config: p.Backoff} o.minConnectTimeout = func() time.Duration { return p.MinConnectTimeout } @@ -274,7 +274,7 @@ func WithBackoffMaxDelay(md time.Duration) DialOption { func WithBackoffConfig(b BackoffConfig) DialOption { bc := grpcbackoff.DefaultConfig bc.MaxDelay = b.MaxDelay - return withBackoff(backoff.Exponential{bc}) + return withBackoff(backoff.Exponential{Config: bc}) } // withBackoff sets the backoff strategy used for connectRetryNum after a failed