From 64330c55b31c95e02f17256078f42976d45b92dc Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Wed, 26 Feb 2020 15:59:46 +0200 Subject: [PATCH] all: use pbgrpc common/pb moved grpc to a separate package common/pb/pbgrpc. This updates this repository to use it. Change-Id: I2de2a190688871cf9cb61f7ea511f8a01e264e4e --- Makefile | 2 +- certificate/peer.go | 3 ++- go.mod | 2 +- go.sum | 10 ++-------- private/testplanet/reconfigure.go | 4 ++-- private/testplanet/referralmanager.go | 3 ++- private/testplanet/uplink_test.go | 8 +++++--- satellite/api.go | 21 +++++++++++---------- satellite/gracefulexit/endpoint.go | 3 ++- satellite/orders/endpoint.go | 3 ++- satellite/referrals/service_test.go | 5 +++-- storagenode/peer.go | 9 +++++---- storagenode/piecestore/endpoint.go | 7 ++++--- storagenode/preflight/localtime_test.go | 3 ++- 14 files changed, 44 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index 2c288e0a3..36110aabc 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ install-sim: ## install storj-sim storj.io/storj/cmd/uplink \ storj.io/storj/cmd/identity \ storj.io/storj/cmd/certificates - cd cmd/gateway && go install -race -v storj.io/storj/cmd/gateway + cd cmd/gateway && go install -race -v . ##@ Test diff --git a/certificate/peer.go b/certificate/peer.go index 8027a2178..123ee45be 100644 --- a/certificate/peer.go +++ b/certificate/peer.go @@ -15,6 +15,7 @@ import ( "storj.io/common/errs2" "storj.io/common/identity" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/peertls/tlsopts" "storj.io/storj/certificate/authorization" "storj.io/storj/pkg/revocation" @@ -86,7 +87,7 @@ func New(log *zap.Logger, ident *identity.FullIdentity, ca *identity.FullCertifi peer.AuthorizationDB = authorizationDB peer.Certificate.Endpoint = NewEndpoint(log.Named("certificate"), ca, authorizationDB, uint16(config.MinDifficulty)) - pb.RegisterCertificatesServer(peer.Server.GRPC(), peer.Certificate.Endpoint) + pbgrpc.RegisterCertificatesServer(peer.Server.GRPC(), peer.Certificate.Endpoint) pb.DRPCRegisterCertificates(peer.Server.DRPC(), peer.Certificate.Endpoint) var err error diff --git a/go.mod b/go.mod index 05f47fa33..23b4e0e30 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( golang.org/x/time v0.0.0-20191024005414-555d28b269f0 google.golang.org/grpc v1.26.0 gopkg.in/yaml.v2 v2.2.4 - storj.io/common v0.0.0-20200226144507-3fe9f7839df5 + storj.io/common v0.0.0-20200226185531-a823b4a45116 storj.io/drpc v0.0.8 storj.io/uplink v1.0.0-rc.2 ) diff --git a/go.sum b/go.sum index 25487d071..58d20e61c 100644 --- a/go.sum +++ b/go.sum @@ -411,8 +411,6 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 h1:sKJQZMuxjOAR/Uo2LBfU90onWEf1dF4C+0hPJCc9Mpc= -golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -575,15 +573,11 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -storj.io/common v0.0.0-20200214070817-cfd197b055d7/go.mod h1:MlYmhIuKHfD15puGH7Su5lv0bt4ojZ7IfrPnAmR4NeI= -storj.io/common v0.0.0-20200221161141-79b008e3eff0 h1:lN5HVfeSa7uwbVYQ1CyQZ3I5nUeZzgejrGJZVjRsktg= -storj.io/common v0.0.0-20200221161141-79b008e3eff0/go.mod h1:lCc2baFO7GQlKsPTri8xwCsCPO2LsEUUiAGeRQuXY48= -storj.io/common v0.0.0-20200226144507-3fe9f7839df5 h1:PbXUP30pEdk+HiRPwLfBD9wA+CY1Eu788BwJPecpFBM= storj.io/common v0.0.0-20200226144507-3fe9f7839df5/go.mod h1:lCc2baFO7GQlKsPTri8xwCsCPO2LsEUUiAGeRQuXY48= +storj.io/common v0.0.0-20200226185531-a823b4a45116 h1:lyAJ2vNPzmE+5b5mUjOid6ZhXTCvcCyjbScR+EG7F8A= +storj.io/common v0.0.0-20200226185531-a823b4a45116/go.mod h1:lCc2baFO7GQlKsPTri8xwCsCPO2LsEUUiAGeRQuXY48= storj.io/drpc v0.0.7-0.20191115031725-2171c57838d2/go.mod h1:/ascUDbzNAv0A3Jj7wUIKFBH2JdJ2uJIBO/b9+2yHgQ= storj.io/drpc v0.0.8 h1:wu68cMmtoT0vSWIAZz29RpJkWdi4o0S8BIrLslpH5FQ= storj.io/drpc v0.0.8/go.mod h1:v39uWro/EbXXk+gNnrM9FQuVVS2zUBWBfeduydgeXUA= -storj.io/uplink v0.0.0-20200221171743-26268cdd3552 h1:yXojx6mQXtJfwh5qdUEakWvh+EXkJbTV4qWE1aPJzTU= -storj.io/uplink v0.0.0-20200221171743-26268cdd3552/go.mod h1:SAetpjpLjDx0bH/TgfMaD2O/S283bn/Kcz8f/juI03I= storj.io/uplink v1.0.0-rc.2 h1:IykgqbqwXDRJAaDXO0+t1CCfntetRvdWK9mUQsWtz/8= storj.io/uplink v1.0.0-rc.2/go.mod h1:WUQYQZFI7iUxqarO1zhUwlVgiHxv4PGZlsQFh8XE8yg= diff --git a/private/testplanet/reconfigure.go b/private/testplanet/reconfigure.go index 73b75610c..e30353d3d 100644 --- a/private/testplanet/reconfigure.go +++ b/private/testplanet/reconfigure.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" "storj.io/common/identity/testidentity" - "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/storj" "storj.io/storj/satellite" "storj.io/storj/satellite/metainfo" @@ -21,7 +21,7 @@ type Reconfigure struct { NewSatelliteDB func(log *zap.Logger, index int) (satellite.DB, error) NewSatellitePointerDB func(log *zap.Logger, index int) (metainfo.PointerDB, error) Satellite func(log *zap.Logger, index int, config *satellite.Config) - ReferralManagerServer func(log *zap.Logger) pb.ReferralManagerServer + ReferralManagerServer func(log *zap.Logger) pbgrpc.ReferralManagerServer NewStorageNodeDB func(index int, db storagenode.DB, log *zap.Logger) (storagenode.DB, error) StorageNode func(index int, config *storagenode.Config) diff --git a/private/testplanet/referralmanager.go b/private/testplanet/referralmanager.go index ed45e5aed..908cfdcd0 100644 --- a/private/testplanet/referralmanager.go +++ b/private/testplanet/referralmanager.go @@ -9,6 +9,7 @@ import ( "path/filepath" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/peertls/extensions" "storj.io/common/peertls/tlsopts" "storj.io/common/testrand" @@ -50,7 +51,7 @@ func (planet *Planet) newReferralManager() (*server.Server, error) { }, } - var endpoints pb.ReferralManagerServer + var endpoints pbgrpc.ReferralManagerServer // only create a referral manager server if testplanet was reconfigured with a custom referral manager endpoint if planet.config.Reconfigure.ReferralManagerServer != nil { endpoints = planet.config.Reconfigure.ReferralManagerServer(log) diff --git a/private/testplanet/uplink_test.go b/private/testplanet/uplink_test.go index 98045837b..f64498bef 100644 --- a/private/testplanet/uplink_test.go +++ b/private/testplanet/uplink_test.go @@ -17,6 +17,7 @@ import ( "storj.io/common/memory" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/peertls/extensions" "storj.io/common/peertls/tlsopts" "storj.io/common/storj" @@ -156,10 +157,11 @@ func TestDownloadWithSomeNodesOffline(t *testing.T) { type piecestoreMock struct { } -func (mock *piecestoreMock) Upload(server pb.Piecestore_UploadServer) error { +func (mock *piecestoreMock) Upload(server pbgrpc.Piecestore_UploadServer) error { return nil } -func (mock *piecestoreMock) Download(server pb.Piecestore_DownloadServer) error { + +func (mock *piecestoreMock) Download(server pbgrpc.Piecestore_DownloadServer) error { timoutTicker := time.NewTicker(30 * time.Second) defer timoutTicker.Stop() @@ -242,7 +244,7 @@ func TestDownloadFromUnresponsiveNode(t *testing.T) { server, err := server.New(storageNode.Log.Named("mock-server"), tlsOptions, storageNode.Addr(), storageNode.PrivateAddr(), nil) require.NoError(t, err) - pb.RegisterPiecestoreServer(server.GRPC(), &piecestoreMock{}) + pbgrpc.RegisterPiecestoreServer(server.GRPC(), &piecestoreMock{}) defer ctx.Check(server.Close) diff --git a/satellite/api.go b/satellite/api.go index cf6a8494a..f0e3a17c6 100644 --- a/satellite/api.go +++ b/satellite/api.go @@ -17,6 +17,7 @@ import ( "storj.io/common/identity" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/peertls/extensions" "storj.io/common/peertls/tlsopts" "storj.io/common/rpc" @@ -244,7 +245,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, }) peer.Overlay.Inspector = overlay.NewInspector(peer.Overlay.Service) - pb.RegisterOverlayInspectorServer(peer.Server.PrivateGRPC(), peer.Overlay.Inspector) + pbgrpc.RegisterOverlayInspectorServer(peer.Server.PrivateGRPC(), peer.Overlay.Inspector) pb.DRPCRegisterOverlayInspector(peer.Server.PrivateDRPC(), peer.Overlay.Inspector) } @@ -271,7 +272,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, } peer.Contact.Service = contact.NewService(peer.Log.Named("contact:service"), self, peer.Overlay.Service, peer.DB.PeerIdentities(), peer.Dialer) peer.Contact.Endpoint = contact.NewEndpoint(peer.Log.Named("contact:endpoint"), peer.Contact.Service) - pb.RegisterNodeServer(peer.Server.GRPC(), peer.Contact.Endpoint) + pbgrpc.RegisterNodeServer(peer.Server.GRPC(), peer.Contact.Endpoint) pb.DRPCRegisterNode(peer.Server.DRPC(), peer.Contact.Endpoint) peer.Services.Add(lifecycle.Item{ @@ -281,7 +282,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, } { // setup vouchers - pb.RegisterVouchersServer(peer.Server.GRPC(), peer.Vouchers.Endpoint) + pbgrpc.RegisterVouchersServer(peer.Server.GRPC(), peer.Vouchers.Endpoint) pb.DRPCRegisterVouchers(peer.Server.DRPC(), peer.Vouchers.Endpoint) } @@ -328,7 +329,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, config.Repairer.MaxExcessRateOptimalThreshold, config.Orders.NodeStatusLogging, ) - pb.RegisterOrdersServer(peer.Server.GRPC(), peer.Orders.Endpoint) + pbgrpc.RegisterOrdersServer(peer.Server.GRPC(), peer.Orders.Endpoint) pb.DRPCRegisterOrders(peer.Server.DRPC(), peer.Orders.Endpoint.DRPC()) } @@ -403,7 +404,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, config.Metainfo.MaxCommitInterval, config.Metainfo.RateLimiter, ) - pb.RegisterMetainfoServer(peer.Server.GRPC(), peer.Metainfo.Endpoint2) + pbgrpc.RegisterMetainfoServer(peer.Server.GRPC(), peer.Metainfo.Endpoint2) pb.DRPCRegisterMetainfo(peer.Server.DRPC(), peer.Metainfo.Endpoint2) peer.Services.Add(lifecycle.Item{ @@ -414,7 +415,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, { // setup datarepair peer.Repair.Inspector = irreparable.NewInspector(peer.DB.Irreparable()) - pb.RegisterIrreparableInspectorServer(peer.Server.PrivateGRPC(), peer.Repair.Inspector) + pbgrpc.RegisterIrreparableInspectorServer(peer.Server.PrivateGRPC(), peer.Repair.Inspector) pb.DRPCRegisterIrreparableInspector(peer.Server.PrivateDRPC(), peer.Repair.Inspector) } @@ -424,7 +425,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, peer.Overlay.Service, peer.Metainfo.Service, ) - pb.RegisterHealthInspectorServer(peer.Server.PrivateGRPC(), peer.Inspector.Endpoint) + pbgrpc.RegisterHealthInspectorServer(peer.Server.PrivateGRPC(), peer.Inspector.Endpoint) pb.DRPCRegisterHealthInspector(peer.Server.PrivateDRPC(), peer.Inspector.Endpoint) } @@ -529,7 +530,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, service, pc.StripeCoinPayments.ConversionRatesCycleInterval) - pb.RegisterPaymentsServer(peer.Server.PrivateGRPC(), peer.Payments.Inspector) + pbgrpc.RegisterPaymentsServer(peer.Server.PrivateGRPC(), peer.Payments.Inspector) pb.DRPCRegisterPayments(peer.Server.PrivateDRPC(), peer.Payments.Inspector) peer.Services.Add(lifecycle.Item{ @@ -597,7 +598,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, peer.Overlay.DB, peer.DB.StoragenodeAccounting(), ) - pb.RegisterNodeStatsServer(peer.Server.GRPC(), peer.NodeStats.Endpoint) + pbgrpc.RegisterNodeStatsServer(peer.Server.GRPC(), peer.NodeStats.Endpoint) pb.DRPCRegisterNodeStats(peer.Server.DRPC(), peer.NodeStats.Endpoint) } @@ -614,7 +615,7 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, peer.DB.PeerIdentities(), config.GracefulExit) - pb.RegisterSatelliteGracefulExitServer(peer.Server.GRPC(), peer.GracefulExit.Endpoint) + pbgrpc.RegisterSatelliteGracefulExitServer(peer.Server.GRPC(), peer.GracefulExit.Endpoint) pb.DRPCRegisterSatelliteGracefulExit(peer.Server.DRPC(), peer.GracefulExit.Endpoint.DRPC()) } else { peer.Log.Named("gracefulexit").Info("disabled") diff --git a/satellite/gracefulexit/endpoint.go b/satellite/gracefulexit/endpoint.go index 7afbd1afb..8ab51be90 100644 --- a/satellite/gracefulexit/endpoint.go +++ b/satellite/gracefulexit/endpoint.go @@ -16,6 +16,7 @@ import ( "storj.io/common/errs2" "storj.io/common/identity" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/rpc/rpcstatus" "storj.io/common/signing" "storj.io/common/storj" @@ -121,7 +122,7 @@ func NewEndpoint(log *zap.Logger, signer signing.Signer, db DB, overlaydb overla } // Process is called by storage nodes to receive pieces to transfer to new nodes and get exit status. -func (endpoint *Endpoint) Process(stream pb.SatelliteGracefulExit_ProcessServer) (err error) { +func (endpoint *Endpoint) Process(stream pbgrpc.SatelliteGracefulExit_ProcessServer) (err error) { return endpoint.doProcess(stream) } diff --git a/satellite/orders/endpoint.go b/satellite/orders/endpoint.go index 32a5ace43..284fda261 100644 --- a/satellite/orders/endpoint.go +++ b/satellite/orders/endpoint.go @@ -17,6 +17,7 @@ import ( "storj.io/common/identity" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/rpc/rpcstatus" "storj.io/common/signing" "storj.io/common/storj" @@ -228,7 +229,7 @@ func monitoredSettlementStreamSend(ctx context.Context, stream settlementStream, } // Settlement receives orders and handles them in batches -func (endpoint *Endpoint) Settlement(stream pb.Orders_SettlementServer) (err error) { +func (endpoint *Endpoint) Settlement(stream pbgrpc.Orders_SettlementServer) (err error) { return endpoint.doSettlement(stream) } diff --git a/satellite/referrals/service_test.go b/satellite/referrals/service_test.go index 50d44952b..aeae02758 100644 --- a/satellite/referrals/service_test.go +++ b/satellite/referrals/service_test.go @@ -11,6 +11,7 @@ import ( "go.uber.org/zap" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/rpc/rpcstatus" "storj.io/common/testcontext" "storj.io/common/testrand" @@ -23,7 +24,7 @@ func TestServiceSuccess(t *testing.T) { testplanet.Run(t, testplanet.Config{ SatelliteCount: 1, Reconfigure: testplanet.Reconfigure{ - ReferralManagerServer: func(logger *zap.Logger) pb.ReferralManagerServer { + ReferralManagerServer: func(logger *zap.Logger) pbgrpc.ReferralManagerServer { endpoint := &endpointHappyPath{} endpoint.SetTokenCount(tokenCount) return endpoint @@ -58,7 +59,7 @@ func TestServiceRedeemFailure(t *testing.T) { testplanet.Run(t, testplanet.Config{ SatelliteCount: 1, Reconfigure: testplanet.Reconfigure{ - ReferralManagerServer: func(logger *zap.Logger) pb.ReferralManagerServer { + ReferralManagerServer: func(logger *zap.Logger) pbgrpc.ReferralManagerServer { endpoint := &endpointFailedPath{} endpoint.SetTokenCount(2) return endpoint diff --git a/storagenode/peer.go b/storagenode/peer.go index 9dcce8d59..4d9762584 100644 --- a/storagenode/peer.go +++ b/storagenode/peer.go @@ -17,6 +17,7 @@ import ( "storj.io/common/identity" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/peertls/extensions" "storj.io/common/peertls/tlsopts" "storj.io/common/rpc" @@ -352,7 +353,7 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, revocationDB exten }) peer.Contact.Endpoint = contact.NewEndpoint(peer.Log.Named("contact:endpoint"), peer.Contact.PingStats) - pb.RegisterContactServer(peer.Server.GRPC(), peer.Contact.Endpoint) + pbgrpc.RegisterContactServer(peer.Server.GRPC(), peer.Contact.Endpoint) pb.DRPCRegisterContact(peer.Server.DRPC(), peer.Contact.Endpoint) } @@ -447,7 +448,7 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, revocationDB exten Close: peer.Storage2.Endpoint.Close, }) - pb.RegisterPiecestoreServer(peer.Server.GRPC(), peer.Storage2.Endpoint) + pbgrpc.RegisterPiecestoreServer(peer.Server.GRPC(), peer.Storage2.Endpoint) pb.DRPCRegisterPiecestore(peer.Server.DRPC(), peer.Storage2.Endpoint.DRPC()) // TODO workaround for custom timeout for order sending request (read/write) @@ -563,7 +564,7 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, revocationDB exten peer.Console.Listener.Addr(), config.Contact.ExternalAddress, ) - pb.RegisterPieceStoreInspectorServer(peer.Server.PrivateGRPC(), peer.Storage2.Inspector) + pbgrpc.RegisterPieceStoreInspectorServer(peer.Server.PrivateGRPC(), peer.Storage2.Inspector) pb.DRPCRegisterPieceStoreInspector(peer.Server.PrivateDRPC(), peer.Storage2.Inspector) } @@ -574,7 +575,7 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, revocationDB exten peer.DB.Satellites(), peer.Storage2.BlobsCache, ) - pb.RegisterNodeGracefulExitServer(peer.Server.PrivateGRPC(), peer.GracefulExit.Endpoint) + pbgrpc.RegisterNodeGracefulExitServer(peer.Server.PrivateGRPC(), peer.GracefulExit.Endpoint) pb.DRPCRegisterNodeGracefulExit(peer.Server.PrivateDRPC(), peer.GracefulExit.Endpoint) peer.GracefulExit.Chore = gracefulexit.NewChore( diff --git a/storagenode/piecestore/endpoint.go b/storagenode/piecestore/endpoint.go index 85cfce696..8b4f7a3b0 100644 --- a/storagenode/piecestore/endpoint.go +++ b/storagenode/piecestore/endpoint.go @@ -20,6 +20,7 @@ import ( "storj.io/common/identity" "storj.io/common/memory" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/rpc/rpcstatus" "storj.io/common/rpc/rpctimeout" "storj.io/common/signing" @@ -38,7 +39,7 @@ var ( mon = monkit.Package() ) -var _ pb.PiecestoreServer = (*Endpoint)(nil) +var _ pbgrpc.PiecestoreServer = (*Endpoint)(nil) // OldConfig contains everything necessary for a server type OldConfig struct { @@ -211,7 +212,7 @@ func (endpoint *Endpoint) DeletePieces( } // Upload handles uploading a piece on piece store. -func (endpoint *Endpoint) Upload(stream pb.Piecestore_UploadServer) (err error) { +func (endpoint *Endpoint) Upload(stream pbgrpc.Piecestore_UploadServer) (err error) { return endpoint.doUpload(stream, endpoint.grpcReqLimit) } @@ -476,7 +477,7 @@ func (endpoint *Endpoint) doUpload(stream uploadStream, requestLimit int) (err e } // Download handles Downloading a piece on piece store. -func (endpoint *Endpoint) Download(stream pb.Piecestore_DownloadServer) (err error) { +func (endpoint *Endpoint) Download(stream pbgrpc.Piecestore_DownloadServer) (err error) { return endpoint.doDownload(stream) } diff --git a/storagenode/preflight/localtime_test.go b/storagenode/preflight/localtime_test.go index 9f3cbc715..98ee0ef92 100644 --- a/storagenode/preflight/localtime_test.go +++ b/storagenode/preflight/localtime_test.go @@ -16,6 +16,7 @@ import ( "storj.io/common/identity/testidentity" "storj.io/common/pb" + "storj.io/common/pb/pbgrpc" "storj.io/common/peertls/extensions" "storj.io/common/peertls/tlsopts" "storj.io/common/rpc" @@ -29,7 +30,7 @@ import ( type mockServer struct { localTime time.Time - pb.NodeServer + pbgrpc.NodeServer } func TestLocalTime_InSync(t *testing.T) {