From 4bdb791334597f76a40afd4c2d460dee854fc981 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Wed, 24 Nov 2021 21:56:36 +0800 Subject: [PATCH] dep: use RomiChan/protobuf --- binary/jce/reader.go | 2 +- go.mod | 1 + go.sum | 2 ++ internal/proto/wrapper.go | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/binary/jce/reader.go b/binary/jce/reader.go index e1f88fb3..12159f40 100644 --- a/binary/jce/reader.go +++ b/binary/jce/reader.go @@ -43,7 +43,7 @@ func (r *JceReader) peakHead() (h HeadData, l int32) { } func (r *JceReader) skip(l int) { - r.readBytes(l) + r.off += l } func (r *JceReader) skipField(t byte) { diff --git a/go.mod b/go.mod index 9d01057f..337c07b1 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/Mrs4s/MiraiGo go 1.16 require ( + github.com/RomiChan/protobuf v0.0.0-20211124134334-257932207c53 github.com/klauspost/compress v1.13.6 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.3.0 diff --git a/go.sum b/go.sum index ae8bb42b..39bca60f 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/RomiChan/protobuf v0.0.0-20211124134334-257932207c53 h1:sbaXMniSPMlCKtwrBvCZd53kUf2upvmOE/Dku6gFtXY= +github.com/RomiChan/protobuf v0.0.0-20211124134334-257932207c53/go.mod h1:2h54jTA7gqc5o5UjwPUZm0G8D218mEpu8WYAnNcvE7I= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= diff --git a/internal/proto/wrapper.go b/internal/proto/wrapper.go index d7b3874f..c5865421 100644 --- a/internal/proto/wrapper.go +++ b/internal/proto/wrapper.go @@ -1,8 +1,8 @@ package proto -import "google.golang.org/protobuf/proto" +import "github.com/RomiChan/protobuf/proto" -type Message = proto.Message +type Message = interface{} func Marshal(m Message) ([]byte, error) { return proto.Marshal(m)