From 012a7ee5f061d0afda122fbb462f5341f38fc62e Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Fri, 2 Aug 2024 11:14:12 +0200 Subject: [PATCH] Change gogo/protobuf to anyproto/protobuf --- Makefile | 9 +++++++-- commonfile/fileproto/file.pb.go | 2 +- commonfile/fileproto/file_drpc.pb.go | 4 ++-- commonspace/object/acl/aclrecordproto/aclrecord.pb.go | 2 +- commonspace/object/acl/list/aclrecordbuilder.go | 2 +- commonspace/object/acl/list/aclstate.go | 2 +- commonspace/object/acl/syncacl/response.go | 2 +- commonspace/object/acl/syncacl/syncaclhandler.go | 2 +- commonspace/object/acl/syncacl/syncaclhandler_test.go | 2 +- commonspace/object/tree/objecttree/change.go | 2 +- commonspace/object/tree/objecttree/changebuilder.go | 2 +- commonspace/object/tree/objecttree/derivedtree.go | 2 +- commonspace/object/tree/objecttree/objecttree_test.go | 2 +- commonspace/object/tree/synctree/response.go | 2 +- commonspace/object/tree/synctree/synchandler.go | 2 +- .../object/tree/synctree/treeremotegetter_test.go | 2 +- commonspace/object/tree/treechangeproto/treechange.pb.go | 2 +- commonspace/payloads.go | 2 +- commonspace/settings/settingsobject.go | 2 +- commonspace/settings/settingsstate/changefactory_test.go | 2 +- commonspace/settings/settingsstate/statebuilder.go | 2 +- commonspace/spacesyncproto/spacesync.go | 2 +- commonspace/spacesyncproto/spacesync.pb.go | 2 +- commonspace/spacesyncproto/spacesync_drpc.pb.go | 4 ++-- commonspace/sync/objectsync/objectmessages/headupdate.go | 2 +- commonspace/sync/objectsync/objectmessages/request.go | 2 +- commonspace/sync/objectsync/synchandler.go | 2 +- commonspace/sync/requestmanager.go | 2 +- commonspace/sync/syncdeps/request.go | 2 +- commonspace/sync/syncdeps/syncdeps.go | 2 +- commonspace/sync/synctest/counterrequest.go | 2 +- commonspace/sync/synctest/counterrequesthandler.go | 2 +- commonspace/sync/synctest/countersynchandler.go | 2 +- commonspace/sync/synctest/counterupdate.go | 2 +- commonspace/sync/synctestproto/helpers.go | 2 +- commonspace/sync/synctestproto/synctest.pb.go | 2 +- commonspace/sync/synctestproto/synctest_drpc.pb.go | 4 ++-- consensus/consensusproto/consensus.pb.go | 2 +- consensus/consensusproto/consensus_drpc.pb.go | 4 ++-- coordinator/coordinatorproto/coordinator.pb.go | 2 +- coordinator/coordinatorproto/coordinator_drpc.pb.go | 4 ++-- coordinator/coordinatorproto/receipt.go | 2 +- coordinator/coordinatorproto/receipt_test.go | 2 +- go.mod | 5 ++--- go.sum | 6 ++++-- identityrepo/identityrepoproto/identityrepo.pb.go | 2 +- identityrepo/identityrepoproto/identityrepo_drpc.pb.go | 4 ++-- nameservice/nameserviceproto/nameservice.pb.go | 2 +- nameservice/nameserviceproto/nameservice_aa.pb.go | 2 +- nameservice/nameserviceproto/nameservice_aa_drpc.pb.go | 4 ++-- nameservice/nameserviceproto/nameservice_drpc.pb.go | 4 ++-- net/rpc/limiter/limiterproto/limiter.pb.go | 2 +- .../handshake/handshakeproto/handshake.pb.go | 2 +- net/streampool/encoding.go | 2 +- net/streampool/testservice/testservice.pb.go | 2 +- net/streampool/testservice/testservice_drpc.pb.go | 4 ++-- paymentservice/paymentserviceproto/paymentservice.pb.go | 2 +- .../paymentserviceproto/paymentservice_drpc.pb.go | 4 ++-- .../paymentserviceproto/paymentservice_tiers.pb.go | 2 +- util/crypto/aes.go | 2 +- util/crypto/cryptoproto/crypto.pb.go | 2 +- util/crypto/ed25519.go | 2 +- 62 files changed, 82 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index efb263a0..c8661a6f 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,9 @@ all: @set -e; @git config core.hooksPath .githooks; -proto: +proto: proto-execute replace-strings + +proto-execute: @echo 'Generating protobuf packages (Go)...' @$(eval P_ACL_RECORDS_PATH_PB := commonspace/object/acl/aclrecordproto) @@ -34,8 +36,11 @@ proto: deps: go mod download go build -o deps storj.io/drpc/cmd/protoc-gen-go-drpc - go build -o deps github.com/gogo/protobuf/protoc-gen-gogofaster + go build -o deps github.com/anyproto/protobuf/protoc-gen-gogofaster test: go test ./... --cover +replace-strings: + @echo "Replacing 'github.com/gogo/protobuf' with 'github.com/anyproto/protobuf' in all files recursively..." + LC_CTYPE=C LANG=C find . -type f -name "*.go" | xargs sed -i '' "s|github.com/gogo/protobuf|github.com/anyproto/protobuf|g" diff --git a/commonfile/fileproto/file.pb.go b/commonfile/fileproto/file.pb.go index 5edb71ad..7211dccb 100644 --- a/commonfile/fileproto/file.pb.go +++ b/commonfile/fileproto/file.pb.go @@ -5,7 +5,7 @@ package fileproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/commonfile/fileproto/file_drpc.pb.go b/commonfile/fileproto/file_drpc.pb.go index f649161a..60299e89 100644 --- a/commonfile/fileproto/file_drpc.pb.go +++ b/commonfile/fileproto/file_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/commonspace/object/acl/aclrecordproto/aclrecord.pb.go b/commonspace/object/acl/aclrecordproto/aclrecord.pb.go index 8416b1d3..9a12af9b 100644 --- a/commonspace/object/acl/aclrecordproto/aclrecord.pb.go +++ b/commonspace/object/acl/aclrecordproto/aclrecord.pb.go @@ -5,7 +5,7 @@ package aclrecordproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/commonspace/object/acl/list/aclrecordbuilder.go b/commonspace/object/acl/list/aclrecordbuilder.go index 14a5c400..e71f94d1 100644 --- a/commonspace/object/acl/list/aclrecordbuilder.go +++ b/commonspace/object/acl/list/aclrecordbuilder.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/object/accountdata" "github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto" diff --git a/commonspace/object/acl/list/aclstate.go b/commonspace/object/acl/list/aclstate.go index 0f16f740..706cfc22 100644 --- a/commonspace/object/acl/list/aclstate.go +++ b/commonspace/object/acl/list/aclstate.go @@ -3,7 +3,7 @@ package list import ( "errors" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "go.uber.org/zap" "github.com/anyproto/any-sync/app/logger" diff --git a/commonspace/object/acl/syncacl/response.go b/commonspace/object/acl/syncacl/response.go index 3c1f4c6b..fb7cf866 100644 --- a/commonspace/object/acl/syncacl/response.go +++ b/commonspace/object/acl/syncacl/response.go @@ -3,7 +3,7 @@ package syncacl import ( "fmt" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/spacesyncproto" "github.com/anyproto/any-sync/consensus/consensusproto" diff --git a/commonspace/object/acl/syncacl/syncaclhandler.go b/commonspace/object/acl/syncacl/syncaclhandler.go index 9add2ec8..5aecf9a0 100644 --- a/commonspace/object/acl/syncacl/syncaclhandler.go +++ b/commonspace/object/acl/syncacl/syncaclhandler.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "go.uber.org/zap" "storj.io/drpc" diff --git a/commonspace/object/acl/syncacl/syncaclhandler_test.go b/commonspace/object/acl/syncacl/syncaclhandler_test.go index bdff2e83..7a5952b2 100644 --- a/commonspace/object/acl/syncacl/syncaclhandler_test.go +++ b/commonspace/object/acl/syncacl/syncaclhandler_test.go @@ -8,7 +8,7 @@ import ( "github.com/anyproto/any-sync/commonspace/spacesyncproto" "github.com/anyproto/any-sync/commonspace/syncstatus" "github.com/anyproto/any-sync/consensus/consensusproto" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" "sync" diff --git a/commonspace/object/tree/objecttree/change.go b/commonspace/object/tree/objecttree/change.go index d50e3c79..48004794 100644 --- a/commonspace/object/tree/objecttree/change.go +++ b/commonspace/object/tree/objecttree/change.go @@ -3,7 +3,7 @@ package objecttree import ( "errors" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto" "github.com/anyproto/any-sync/util/crypto" diff --git a/commonspace/object/tree/objecttree/changebuilder.go b/commonspace/object/tree/objecttree/changebuilder.go index 4bf26838..b05dc20f 100644 --- a/commonspace/object/tree/objecttree/changebuilder.go +++ b/commonspace/object/tree/objecttree/changebuilder.go @@ -3,7 +3,7 @@ package objecttree import ( "errors" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto" "github.com/anyproto/any-sync/util/cidutil" diff --git a/commonspace/object/tree/objecttree/derivedtree.go b/commonspace/object/tree/objecttree/derivedtree.go index 5d369780..f616bd6b 100644 --- a/commonspace/object/tree/objecttree/derivedtree.go +++ b/commonspace/object/tree/objecttree/derivedtree.go @@ -1,7 +1,7 @@ package objecttree import ( - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto" ) diff --git a/commonspace/object/tree/objecttree/objecttree_test.go b/commonspace/object/tree/objecttree/objecttree_test.go index 5421d105..1e33d534 100644 --- a/commonspace/object/tree/objecttree/objecttree_test.go +++ b/commonspace/object/tree/objecttree/objecttree_test.go @@ -10,7 +10,7 @@ import ( "golang.org/x/exp/slices" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/commonspace/object/tree/synctree/response.go b/commonspace/object/tree/synctree/response.go index 8a8b1e2d..90cec318 100644 --- a/commonspace/object/tree/synctree/response.go +++ b/commonspace/object/tree/synctree/response.go @@ -3,7 +3,7 @@ package synctree import ( "fmt" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto" "github.com/anyproto/any-sync/commonspace/spacesyncproto" diff --git a/commonspace/object/tree/synctree/synchandler.go b/commonspace/object/tree/synctree/synchandler.go index 3e03787e..e270221a 100644 --- a/commonspace/object/tree/synctree/synchandler.go +++ b/commonspace/object/tree/synctree/synchandler.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "go.uber.org/zap" "storj.io/drpc" diff --git a/commonspace/object/tree/synctree/treeremotegetter_test.go b/commonspace/object/tree/synctree/treeremotegetter_test.go index 8ca74709..6f7965ce 100644 --- a/commonspace/object/tree/synctree/treeremotegetter_test.go +++ b/commonspace/object/tree/synctree/treeremotegetter_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/commonspace/object/tree/treechangeproto/treechange.pb.go b/commonspace/object/tree/treechangeproto/treechange.pb.go index 5b56b5dc..f3e81f99 100644 --- a/commonspace/object/tree/treechangeproto/treechange.pb.go +++ b/commonspace/object/tree/treechangeproto/treechange.pb.go @@ -5,7 +5,7 @@ package treechangeproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/commonspace/payloads.go b/commonspace/payloads.go index 18795355..4fad1936 100644 --- a/commonspace/payloads.go +++ b/commonspace/payloads.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto" "github.com/anyproto/any-sync/commonspace/object/acl/list" diff --git a/commonspace/settings/settingsobject.go b/commonspace/settings/settingsobject.go index c3f5b182..1c368d41 100644 --- a/commonspace/settings/settingsobject.go +++ b/commonspace/settings/settingsobject.go @@ -8,7 +8,7 @@ import ( "github.com/anyproto/any-sync/commonspace/deletionmanager" "github.com/anyproto/any-sync/util/crypto" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "go.uber.org/zap" "github.com/anyproto/any-sync/accountservice" diff --git a/commonspace/settings/settingsstate/changefactory_test.go b/commonspace/settings/settingsstate/changefactory_test.go index 236c68d0..fcd2059c 100644 --- a/commonspace/settings/settingsstate/changefactory_test.go +++ b/commonspace/settings/settingsstate/changefactory_test.go @@ -2,7 +2,7 @@ package settingsstate import ( "github.com/anyproto/any-sync/commonspace/spacesyncproto" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" "testing" diff --git a/commonspace/settings/settingsstate/statebuilder.go b/commonspace/settings/settingsstate/statebuilder.go index 2d319f3c..7654d2ce 100644 --- a/commonspace/settings/settingsstate/statebuilder.go +++ b/commonspace/settings/settingsstate/statebuilder.go @@ -3,7 +3,7 @@ package settingsstate import ( "github.com/anyproto/any-sync/commonspace/object/tree/objecttree" "github.com/anyproto/any-sync/commonspace/spacesyncproto" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" ) type StateBuilder interface { diff --git a/commonspace/spacesyncproto/spacesync.go b/commonspace/spacesyncproto/spacesync.go index 417636b2..7575a8c5 100644 --- a/commonspace/spacesyncproto/spacesync.go +++ b/commonspace/spacesyncproto/spacesync.go @@ -2,7 +2,7 @@ package spacesyncproto import ( - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "storj.io/drpc" ) diff --git a/commonspace/spacesyncproto/spacesync.pb.go b/commonspace/spacesyncproto/spacesync.pb.go index 1541c500..b00af678 100644 --- a/commonspace/spacesyncproto/spacesync.pb.go +++ b/commonspace/spacesyncproto/spacesync.pb.go @@ -5,7 +5,7 @@ package spacesyncproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/commonspace/spacesyncproto/spacesync_drpc.pb.go b/commonspace/spacesyncproto/spacesync_drpc.pb.go index 3e4a1ce6..7612fe36 100644 --- a/commonspace/spacesyncproto/spacesync_drpc.pb.go +++ b/commonspace/spacesyncproto/spacesync_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/commonspace/sync/objectsync/objectmessages/headupdate.go b/commonspace/sync/objectsync/objectmessages/headupdate.go index c021b56f..84a9a4b1 100644 --- a/commonspace/sync/objectsync/objectmessages/headupdate.go +++ b/commonspace/sync/objectsync/objectmessages/headupdate.go @@ -3,7 +3,7 @@ package objectmessages import ( "fmt" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/spacesyncproto" ) diff --git a/commonspace/sync/objectsync/objectmessages/request.go b/commonspace/sync/objectsync/objectmessages/request.go index 27295990..042ba8c4 100644 --- a/commonspace/sync/objectsync/objectmessages/request.go +++ b/commonspace/sync/objectsync/objectmessages/request.go @@ -1,7 +1,7 @@ package objectmessages import ( - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/spacesyncproto" ) diff --git a/commonspace/sync/objectsync/synchandler.go b/commonspace/sync/objectsync/synchandler.go index 86743dcf..af23ba6a 100644 --- a/commonspace/sync/objectsync/synchandler.go +++ b/commonspace/sync/objectsync/synchandler.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/cheggaaa/mb/v3" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "storj.io/drpc" "github.com/anyproto/any-sync/app" diff --git a/commonspace/sync/requestmanager.go b/commonspace/sync/requestmanager.go index 3c470dba..45a89fad 100644 --- a/commonspace/sync/requestmanager.go +++ b/commonspace/sync/requestmanager.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "go.uber.org/zap" "storj.io/drpc" diff --git a/commonspace/sync/syncdeps/request.go b/commonspace/sync/syncdeps/request.go index 8c869cf1..7da54ad9 100644 --- a/commonspace/sync/syncdeps/request.go +++ b/commonspace/sync/syncdeps/request.go @@ -1,6 +1,6 @@ package syncdeps -import "github.com/gogo/protobuf/proto" +import "github.com/anyproto/protobuf/proto" type Request interface { PeerId() string diff --git a/commonspace/sync/syncdeps/syncdeps.go b/commonspace/sync/syncdeps/syncdeps.go index a8aebcac..2f369676 100644 --- a/commonspace/sync/syncdeps/syncdeps.go +++ b/commonspace/sync/syncdeps/syncdeps.go @@ -4,7 +4,7 @@ import ( "context" "github.com/cheggaaa/mb/v3" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "storj.io/drpc" "github.com/anyproto/any-sync/app" diff --git a/commonspace/sync/synctest/counterrequest.go b/commonspace/sync/synctest/counterrequest.go index 94458ef5..fd71df46 100644 --- a/commonspace/sync/synctest/counterrequest.go +++ b/commonspace/sync/synctest/counterrequest.go @@ -1,7 +1,7 @@ package synctest import ( - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/sync/synctestproto" ) diff --git a/commonspace/sync/synctest/counterrequesthandler.go b/commonspace/sync/synctest/counterrequesthandler.go index 18e3113b..802d3972 100644 --- a/commonspace/sync/synctest/counterrequesthandler.go +++ b/commonspace/sync/synctest/counterrequesthandler.go @@ -3,7 +3,7 @@ package synctest import ( "context" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "golang.org/x/exp/slices" "github.com/anyproto/any-sync/commonspace/sync/syncdeps" diff --git a/commonspace/sync/synctest/countersynchandler.go b/commonspace/sync/synctest/countersynchandler.go index dbb9121d..6189628c 100644 --- a/commonspace/sync/synctest/countersynchandler.go +++ b/commonspace/sync/synctest/countersynchandler.go @@ -4,7 +4,7 @@ import ( "context" "github.com/cheggaaa/mb/v3" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "storj.io/drpc" "github.com/anyproto/any-sync/app" diff --git a/commonspace/sync/synctest/counterupdate.go b/commonspace/sync/synctest/counterupdate.go index 177177cb..1a940370 100644 --- a/commonspace/sync/synctest/counterupdate.go +++ b/commonspace/sync/synctest/counterupdate.go @@ -1,7 +1,7 @@ package synctest import ( - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/anyproto/any-sync/commonspace/sync/synctestproto" ) diff --git a/commonspace/sync/synctestproto/helpers.go b/commonspace/sync/synctestproto/helpers.go index e1e34c59..b2794d06 100644 --- a/commonspace/sync/synctestproto/helpers.go +++ b/commonspace/sync/synctestproto/helpers.go @@ -1,6 +1,6 @@ package synctestproto -import "github.com/gogo/protobuf/proto" +import "github.com/anyproto/protobuf/proto" func (c *CounterIncrease) MsgSize() uint64 { if c != nil { diff --git a/commonspace/sync/synctestproto/synctest.pb.go b/commonspace/sync/synctestproto/synctest.pb.go index 457630e7..c85babef 100644 --- a/commonspace/sync/synctestproto/synctest.pb.go +++ b/commonspace/sync/synctestproto/synctest.pb.go @@ -5,7 +5,7 @@ package synctestproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/commonspace/sync/synctestproto/synctest_drpc.pb.go b/commonspace/sync/synctestproto/synctest_drpc.pb.go index e0690986..d043d69c 100644 --- a/commonspace/sync/synctestproto/synctest_drpc.pb.go +++ b/commonspace/sync/synctestproto/synctest_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/consensus/consensusproto/consensus.pb.go b/consensus/consensusproto/consensus.pb.go index 7cb0ac20..296eefd8 100644 --- a/consensus/consensusproto/consensus.pb.go +++ b/consensus/consensusproto/consensus.pb.go @@ -5,7 +5,7 @@ package consensusproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/consensus/consensusproto/consensus_drpc.pb.go b/consensus/consensusproto/consensus_drpc.pb.go index ee08af88..6619e724 100644 --- a/consensus/consensusproto/consensus_drpc.pb.go +++ b/consensus/consensusproto/consensus_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/coordinator/coordinatorproto/coordinator.pb.go b/coordinator/coordinatorproto/coordinator.pb.go index 5d1b8efd..51dc24db 100644 --- a/coordinator/coordinatorproto/coordinator.pb.go +++ b/coordinator/coordinatorproto/coordinator.pb.go @@ -5,7 +5,7 @@ package coordinatorproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/coordinator/coordinatorproto/coordinator_drpc.pb.go b/coordinator/coordinatorproto/coordinator_drpc.pb.go index cb798a19..92c390d4 100644 --- a/coordinator/coordinatorproto/coordinator_drpc.pb.go +++ b/coordinator/coordinatorproto/coordinator_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/coordinator/coordinatorproto/receipt.go b/coordinator/coordinatorproto/receipt.go index 19aa17be..376efc94 100644 --- a/coordinator/coordinatorproto/receipt.go +++ b/coordinator/coordinatorproto/receipt.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/anyproto/any-sync/util/crypto" "github.com/anyproto/any-sync/util/strkey" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "time" ) diff --git a/coordinator/coordinatorproto/receipt_test.go b/coordinator/coordinatorproto/receipt_test.go index 07909302..86c31c82 100644 --- a/coordinator/coordinatorproto/receipt_test.go +++ b/coordinator/coordinatorproto/receipt_test.go @@ -4,7 +4,7 @@ import ( "context" "crypto/rand" "github.com/anyproto/any-sync/util/crypto" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/stretchr/testify/require" "testing" "time" diff --git a/go.mod b/go.mod index ebc4468f..f2c851a7 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,13 @@ require ( github.com/anyproto/go-chash v0.1.0 github.com/anyproto/go-slip10 v1.0.0 github.com/anyproto/go-slip21 v1.0.0 + github.com/anyproto/protobuf v1.3.3-0.20240801222536-5596d71a739e github.com/btcsuite/btcd v0.22.1 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/cespare/xxhash v1.1.0 github.com/cheggaaa/mb/v3 v3.0.2 github.com/gobwas/glob v0.2.3 github.com/goccy/go-graphviz v0.1.2 - github.com/gogo/protobuf v1.3.2 github.com/google/uuid v1.6.0 github.com/hashicorp/yamux v0.1.1 github.com/huandu/skiplist v1.2.0 @@ -54,6 +54,7 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f // indirect @@ -100,5 +101,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect lukechampine.com/blake3 v1.2.1 // indirect ) - -replace github.com/gogo/protobuf => github.com/anyproto/protobuf v1.3.3-0.20240715205950-2af411f17dfa diff --git a/go.sum b/go.sum index 75108225..6a700175 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ github.com/anyproto/go-slip10 v1.0.0 h1:uAEtSuudR3jJBOfkOXf3bErxVoxbuKwdoJN55M1i github.com/anyproto/go-slip10 v1.0.0/go.mod h1:BCmIlM1KB8wX6K4/8pOvxPl9oVKfEvZ5vsmO5rkK6vg= github.com/anyproto/go-slip21 v1.0.0 h1:CI7lUqTIwmPOEGVAj4jyNLoICvueh++0U2HoAi3m2ZY= github.com/anyproto/go-slip21 v1.0.0/go.mod h1:gbIJt7HAdr5DuT4f2pFTKCBSUWYsm/fysHBNqgsuxT0= -github.com/anyproto/protobuf v1.3.3-0.20240715205950-2af411f17dfa h1:uQImj4hK8HwkOcxhy/88/+jQpH0n2jX2Iryz6vomhM0= -github.com/anyproto/protobuf v1.3.3-0.20240715205950-2af411f17dfa/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/anyproto/protobuf v1.3.3-0.20240801222536-5596d71a739e h1:BitG6mK/JctFt57+AJO9A6tF06g8Pun/OUjODB/v8z4= +github.com/anyproto/protobuf v1.3.3-0.20240801222536-5596d71a739e/go.mod h1:5+PHE01DgsDPkralb8MYmGg2sPQahsqEJ9ue7ciDHKg= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -77,6 +77,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-graphviz v0.1.2 h1:sWSJ6w13BCm/ZOUTHDVrdvbsxqN8yyzaFcHrH/hQ9Yg= github.com/goccy/go-graphviz v0.1.2/go.mod h1:pMYpbAqJT10V8dzV1JN/g/wUlG/0imKPzn3ZsrchGCI= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= diff --git a/identityrepo/identityrepoproto/identityrepo.pb.go b/identityrepo/identityrepoproto/identityrepo.pb.go index b2070179..9051b22b 100644 --- a/identityrepo/identityrepoproto/identityrepo.pb.go +++ b/identityrepo/identityrepoproto/identityrepo.pb.go @@ -5,7 +5,7 @@ package identityrepoproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/identityrepo/identityrepoproto/identityrepo_drpc.pb.go b/identityrepo/identityrepoproto/identityrepo_drpc.pb.go index 66e6a621..367f1b02 100644 --- a/identityrepo/identityrepoproto/identityrepo_drpc.pb.go +++ b/identityrepo/identityrepoproto/identityrepo_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/nameservice/nameserviceproto/nameservice.pb.go b/nameservice/nameserviceproto/nameservice.pb.go index 85c89f5d..b6d385b8 100644 --- a/nameservice/nameserviceproto/nameservice.pb.go +++ b/nameservice/nameserviceproto/nameservice.pb.go @@ -5,7 +5,7 @@ package nameserviceproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/nameservice/nameserviceproto/nameservice_aa.pb.go b/nameservice/nameserviceproto/nameservice_aa.pb.go index 63649cb2..9bfa19c9 100644 --- a/nameservice/nameserviceproto/nameservice_aa.pb.go +++ b/nameservice/nameserviceproto/nameservice_aa.pb.go @@ -5,7 +5,7 @@ package nameserviceproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/nameservice/nameserviceproto/nameservice_aa_drpc.pb.go b/nameservice/nameserviceproto/nameservice_aa_drpc.pb.go index cc3651e2..ac123f57 100644 --- a/nameservice/nameserviceproto/nameservice_aa_drpc.pb.go +++ b/nameservice/nameserviceproto/nameservice_aa_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/nameservice/nameserviceproto/nameservice_drpc.pb.go b/nameservice/nameserviceproto/nameservice_drpc.pb.go index e662c7af..3612794c 100644 --- a/nameservice/nameserviceproto/nameservice_drpc.pb.go +++ b/nameservice/nameserviceproto/nameservice_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/net/rpc/limiter/limiterproto/limiter.pb.go b/net/rpc/limiter/limiterproto/limiter.pb.go index 5e7ae2c8..4d861989 100644 --- a/net/rpc/limiter/limiterproto/limiter.pb.go +++ b/net/rpc/limiter/limiterproto/limiter.pb.go @@ -5,7 +5,7 @@ package limiterproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" math "math" ) diff --git a/net/secureservice/handshake/handshakeproto/handshake.pb.go b/net/secureservice/handshake/handshakeproto/handshake.pb.go index 6bc20011..54677999 100644 --- a/net/secureservice/handshake/handshakeproto/handshake.pb.go +++ b/net/secureservice/handshake/handshakeproto/handshake.pb.go @@ -5,7 +5,7 @@ package handshakeproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/net/streampool/encoding.go b/net/streampool/encoding.go index d5e23cf8..f0f5d8dd 100644 --- a/net/streampool/encoding.go +++ b/net/streampool/encoding.go @@ -3,7 +3,7 @@ package streampool import ( "errors" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "storj.io/drpc" ) diff --git a/net/streampool/testservice/testservice.pb.go b/net/streampool/testservice/testservice.pb.go index a8da5c70..96128ff2 100644 --- a/net/streampool/testservice/testservice.pb.go +++ b/net/streampool/testservice/testservice.pb.go @@ -5,7 +5,7 @@ package testservice import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/net/streampool/testservice/testservice_drpc.pb.go b/net/streampool/testservice/testservice_drpc.pb.go index 61586be4..84e1feff 100644 --- a/net/streampool/testservice/testservice_drpc.pb.go +++ b/net/streampool/testservice/testservice_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/paymentservice/paymentserviceproto/paymentservice.pb.go b/paymentservice/paymentserviceproto/paymentservice.pb.go index f36964a3..48dfc538 100644 --- a/paymentservice/paymentserviceproto/paymentservice.pb.go +++ b/paymentservice/paymentserviceproto/paymentservice.pb.go @@ -5,7 +5,7 @@ package paymentserviceproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/paymentservice/paymentserviceproto/paymentservice_drpc.pb.go b/paymentservice/paymentserviceproto/paymentservice_drpc.pb.go index 253b1026..543db02b 100644 --- a/paymentservice/paymentserviceproto/paymentservice_drpc.pb.go +++ b/paymentservice/paymentserviceproto/paymentservice_drpc.pb.go @@ -8,8 +8,8 @@ import ( bytes "bytes" context "context" errors "errors" - jsonpb "github.com/gogo/protobuf/jsonpb" - proto "github.com/gogo/protobuf/proto" + jsonpb "github.com/anyproto/protobuf/jsonpb" + proto "github.com/anyproto/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" ) diff --git a/paymentservice/paymentserviceproto/paymentservice_tiers.pb.go b/paymentservice/paymentserviceproto/paymentservice_tiers.pb.go index 9661b9e8..7f6246ae 100644 --- a/paymentservice/paymentserviceproto/paymentservice_tiers.pb.go +++ b/paymentservice/paymentserviceproto/paymentservice_tiers.pb.go @@ -5,7 +5,7 @@ package paymentserviceproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/util/crypto/aes.go b/util/crypto/aes.go index 121e1dc9..74fd1ece 100644 --- a/util/crypto/aes.go +++ b/util/crypto/aes.go @@ -7,7 +7,7 @@ import ( "crypto/subtle" "fmt" "github.com/anyproto/any-sync/util/crypto/cryptoproto" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" mbase "github.com/multiformats/go-multibase" ) diff --git a/util/crypto/cryptoproto/crypto.pb.go b/util/crypto/cryptoproto/crypto.pb.go index d657cc51..bf1d9ccb 100644 --- a/util/crypto/cryptoproto/crypto.pb.go +++ b/util/crypto/cryptoproto/crypto.pb.go @@ -5,7 +5,7 @@ package cryptoproto import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/anyproto/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/util/crypto/ed25519.go b/util/crypto/ed25519.go index fc448731..df86b055 100644 --- a/util/crypto/ed25519.go +++ b/util/crypto/ed25519.go @@ -9,7 +9,7 @@ import ( "fmt" "github.com/anyproto/any-sync/util/crypto/cryptoproto" "github.com/anyproto/any-sync/util/strkey" - "github.com/gogo/protobuf/proto" + "github.com/anyproto/protobuf/proto" "github.com/libp2p/go-libp2p/core/crypto" "io" "sync"