unistack-org/micro-codec-proto
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 15 Wiki Activity

drop old proto

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-03-22 10:28:36 +03:00
parent 7cb42bbd20
commit 235d328b95
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
go.mod
View File

@ -1,9 +1,8 @@
module github.com/unistack-org/micro-codec-proto/v3 module github.com/unistack-org/micro-codec-proto/v3
go 1.15 go 1.16
require ( require (
github.com/golang/protobuf v1.5.1
github.com/unistack-org/micro/v3 v3.2.24 github.com/unistack-org/micro/v3 v3.2.24
google.golang.org/protobuf v1.26.0 google.golang.org/protobuf v1.26.0
) )

3
go.sum
View File

@ -1,8 +1,7 @@
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg= github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=

19
proto.go
View File

@ -5,8 +5,6 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
// nolint: staticcheck
oldproto "github.com/golang/protobuf/proto"
"github.com/unistack-org/micro/v3/codec" "github.com/unistack-org/micro/v3/codec"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )
@ -21,8 +19,6 @@ func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
return m.Data, nil return m.Data, nil
case proto.Message: case proto.Message:
return proto.Marshal(m) return proto.Marshal(m)
case oldproto.Message:
return oldproto.Marshal(m)
} }
return nil, codec.ErrInvalidMessage return nil, codec.ErrInvalidMessage
} }
@ -38,8 +34,6 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}) error {
m.Data = d m.Data = d
case proto.Message: case proto.Message:
return proto.Unmarshal(d, m) return proto.Unmarshal(d, m)
case oldproto.Message:
return oldproto.Unmarshal(d, m)
} }
return codec.ErrInvalidMessage return codec.ErrInvalidMessage
} }
@ -59,12 +53,6 @@ func (c *protoCodec) ReadBody(conn io.Reader, b interface{}) error {
} }
m.Data = buf m.Data = buf
return nil return nil
case oldproto.Message:
buf, err := ioutil.ReadAll(conn)
if err != nil {
return err
}
return oldproto.Unmarshal(buf, m)
case proto.Message: case proto.Message:
buf, err := ioutil.ReadAll(conn) buf, err := ioutil.ReadAll(conn)
if err != nil { if err != nil {
@ -82,13 +70,6 @@ func (c *protoCodec) Write(conn io.Writer, m *codec.Message, b interface{}) erro
case *codec.Frame: case *codec.Frame:
_, err := conn.Write(m.Data) _, err := conn.Write(m.Data)
return err return err
case oldproto.Message:
buf, err := oldproto.Marshal(m)
if err != nil {
return err
}
_, err = conn.Write(buf)
return err
case proto.Message: case proto.Message:
buf, err := proto.Marshal(m) buf, err := proto.Marshal(m)
if err != nil { if err != nil {