From 12dfbc78a306e84834d78ec5841e601efdc2655f Mon Sep 17 00:00:00 2001 From: young-zy Date: Sun, 20 Dec 2020 10:50:46 +0800 Subject: [PATCH] Update protobuf version (rebased from 6d25d51519a65220a50042b447f02075d848faf9) Some change is not adopted since it would break the code base. These changes will be reintroduced at a later date. --- app/reverse/portal.go | 2 +- common/serial/typed_message.go | 3 +-- infra/conf/trojan.go | 2 +- proxy/vless/encoding/addons.go | 2 +- testing/scenarios/common.go | 2 +- v2ray_test.go | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/reverse/portal.go b/app/reverse/portal.go index 5e4236779..eef0f729d 100644 --- a/app/reverse/portal.go +++ b/app/reverse/portal.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/buf" diff --git a/common/serial/typed_message.go b/common/serial/typed_message.go index e59d1d0da..43f8b1ba8 100644 --- a/common/serial/typed_message.go +++ b/common/serial/typed_message.go @@ -2,9 +2,8 @@ package serial import ( "errors" - "reflect" - "github.com/golang/protobuf/proto" + "reflect" ) // ToTypedMessage converts a proto Message into TypedMessage. diff --git a/infra/conf/trojan.go b/infra/conf/trojan.go index d2849f522..5ecf11d2c 100644 --- a/infra/conf/trojan.go +++ b/infra/conf/trojan.go @@ -6,7 +6,7 @@ import ( "strconv" "syscall" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" diff --git a/proxy/vless/encoding/addons.go b/proxy/vless/encoding/addons.go index fdf495113..1259439f6 100644 --- a/proxy/vless/encoding/addons.go +++ b/proxy/vless/encoding/addons.go @@ -6,7 +6,7 @@ package encoding import ( "io" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v4/common/errors" diff --git a/testing/scenarios/common.go b/testing/scenarios/common.go index 66bf9e37f..ebef3ec31 100644 --- a/testing/scenarios/common.go +++ b/testing/scenarios/common.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" diff --git a/v2ray_test.go b/v2ray_test.go index df858df62..f3604b0f7 100644 --- a/v2ray_test.go +++ b/v2ray_test.go @@ -3,7 +3,7 @@ package core_test import ( "testing" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" . "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher"