upd proto package

vadiminshakov · Dec 30, 2024 · 95d8925 · 95d8925
1 parent eff7ea2
commit 95d8925
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -4,13 +4,12 @@ go 1.23.0
 
 require (
 	github.com/dgraph-io/badger/v2 v2.0.3
-	github.com/golang/protobuf v1.5.2
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.2.0
 	github.com/stretchr/testify v1.9.0
 	github.com/vadiminshakov/gowal v0.0.1
 	google.golang.org/grpc v1.50.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/protobuf v1.36.1
 )
 
 require (
@@ -20,6 +19,7 @@ require (
 	github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3 // indirect
 	github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -71,10 +71,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/vadiminshakov/gowal v0.0.0-20240915145658-65d881f4a5e4 h1:cPrEApgpt5ZJBZn5agYQtM7E9IWEt19CbWNfWnnN2cs=
-github.com/vadiminshakov/gowal v0.0.0-20240915145658-65d881f4a5e4/go.mod h1:MixWBivF0qsRLcHGyfRFPbujtxYkpD1VNcO0yD7Xla0=
-github.com/vadiminshakov/gowal v0.0.0-20240924193609-26914d93ef10 h1:gHh4fpcJLCBIzYRDD2kSenlNI1TaOjeFjqTVvfIgoIE=
-github.com/vadiminshakov/gowal v0.0.0-20240924193609-26914d93ef10/go.mod h1:MixWBivF0qsRLcHGyfRFPbujtxYkpD1VNcO0yD7Xla0=
 github.com/vadiminshakov/gowal v0.0.1 h1:lNcc4YaPX9ocYnpa9FQ6VkEbUD+iVB2So6Q8+OewYOA=
 github.com/vadiminshakov/gowal v0.0.1/go.mod h1:MixWBivF0qsRLcHGyfRFPbujtxYkpD1VNcO0yD7Xla0=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
@@ -104,8 +100,8 @@ google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=
 google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/io/gateway/grpc/client/client.go b/io/gateway/grpc/client/client.go
@@ -2,12 +2,12 @@ package client
 
 import (
 	"context"
-	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
 	"github.com/vadiminshakov/committer/io/gateway/grpc/proto"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials/insecure"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"time"
 )
 
@@ -59,7 +59,7 @@ func (client *CommitClient) Put(ctx context.Context, key string, value []byte) (
 
 // NodeInfo gets info about current node height.
 func (client *CommitClient) NodeInfo(ctx context.Context) (*proto.Info, error) {
-	return client.Connection.NodeInfo(ctx, &empty.Empty{})
+	return client.Connection.NodeInfo(ctx, &emptypb.Empty{})
 }
 
 // Get queries value of specific key

diff --git a/io/gateway/grpc/server/server.go b/io/gateway/grpc/server/server.go
@@ -3,14 +3,14 @@ package server
 import (
 	"context"
 	"errors"
-	"github.com/golang/protobuf/ptypes/empty"
 	log "github.com/sirupsen/logrus"
 	"github.com/vadiminshakov/committer/config"
 	"github.com/vadiminshakov/committer/core/cohort"
 	"github.com/vadiminshakov/committer/core/dto"
 	"github.com/vadiminshakov/committer/io/db"
 	"github.com/vadiminshakov/committer/io/gateway/grpc/proto"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"net"
 	"time"
 )
@@ -79,7 +79,7 @@ func (s *Server) Put(ctx context.Context, req *proto.Entry) (*proto.Response, er
 	}, nil
 }
 
-func (s *Server) NodeInfo(ctx context.Context, req *empty.Empty) (*proto.Info, error) {
+func (s *Server) NodeInfo(ctx context.Context, req *emptypb.Empty) (*proto.Info, error) {
 	return &proto.Info{Height: s.cohort.Height()}, nil
 }