From 427f63e35962f808d07760781a20828372a2f9e7 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 12 May 2022 14:19:34 +0300 Subject: [PATCH] [#1328] services/tree: Fix grpc import path Signed-off-by: Evgenii Stratonikov --- go.mod | 8 -------- go.sum | Bin 99333 -> 98808 bytes pkg/services/tree/replicator.go | 5 ++--- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 592d2d9ee..7b096a85e 100644 --- a/go.mod +++ b/go.mod @@ -38,10 +38,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) -require google.golang.org/api v0.44.0 - require ( - cloud.google.com/go v0.81.0 // indirect github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521073959-f0d4d129b7f1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd v0.22.0-beta // indirect @@ -50,10 +47,8 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.3 // indirect - github.com/google/go-cmp v0.5.6 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -92,15 +87,12 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect github.com/twmb/murmur3 v1.1.5 // indirect github.com/urfave/cli v1.22.5 // indirect - go.opencensus.io v0.23.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect - golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 18e1acfabe8b9c3dd6d156a1f905b463b8015151..b74ff3867c9e5c2e85d7256c432346d26e0ad534 100644 GIT binary patch delta 42 zcmV+_0M-A6hz9tB2Czg1vycYeIJ4b9kCd~u)O|CznFs+TO1BJC0d@kn)l~s7E|*0S AVgLXD delta 360 zcmW;I%}#=F008jO8g=QWht|c;ZUUk}Z7xMoz%TgoDO(3bP&6GMCdjq5b!*KQuh6m0 zgHO;C^aQ>|#}*IpyZnBi;O7_ks|6#48Fp)~DS1&&l!U;oo&Zo@(3aJWN0J_6ER&cK zX~qHF6{f1xn|Qge!$&G}SU`G8V2*tcqh>?eis;Cd!||$Z%Lc37*bG2Kxyq|XJla9^ z-0roO+n?WkzGryqHzTy?^kT_MC^wK?%8o^gbhaYubVUX6S4~8xiYkKj_a8qgo*|Ss zu^!zjZryN10IiSEEGhGGb7l&^N!b^X`>~;14 diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go index 16399ef91..7dd9adbac 100644 --- a/pkg/services/tree/replicator.go +++ b/pkg/services/tree/replicator.go @@ -14,8 +14,7 @@ import ( cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" netmapSDK "github.com/nspcc-dev/neofs-sdk-go/netmap" "go.uber.org/zap" - "google.golang.org/api/option" - "google.golang.org/api/transport/grpc" + "google.golang.org/grpc" ) type movePair struct { @@ -67,7 +66,7 @@ func (s *Service) replicate(ctx context.Context, op movePair) error { var lastErr error n.IterateNetworkEndpoints(func(addr string) bool { - cc, err := grpc.Dial(ctx, option.WithEndpoint(addr)) + cc, err := grpc.DialContext(ctx, addr) if err != nil { lastErr = err return false