1
0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-24 03:46:37 +02:00

Merge pull request #113 from bilibili/remove-ecode-pb

hidden deprecated package
This commit is contained in:
cheng wei 2019-05-21 14:09:17 +08:00 committed by GitHub
commit 50b05a7b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 7 deletions

View File

@ -10,13 +10,11 @@ import (
"time"
"github.com/bilibili/kratos/pkg/ecode"
epb "github.com/bilibili/kratos/pkg/ecode/pb"
"github.com/bilibili/kratos/pkg/log"
"github.com/bilibili/kratos/pkg/net/rpc/warden"
pb "github.com/bilibili/kratos/pkg/net/rpc/warden/internal/proto/testproto"
xtime "github.com/bilibili/kratos/pkg/time"
"github.com/golang/protobuf/ptypes"
"google.golang.org/grpc"
)
@ -26,9 +24,7 @@ type helloServer struct {
func (s *helloServer) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
if in.Name == "err_detail_test" {
any, _ := ptypes.MarshalAny(&pb.HelloReply{Success: true, Message: "this is test detail"})
err := epb.From(ecode.AccessDenied)
err.ErrDetail = any
err, _ := ecode.Error(ecode.AccessDenied, "AccessDenied").WithDetails(&pb.HelloReply{Success: true, Message: "this is test detail"})
return nil, err
}
return &pb.HelloReply{Message: fmt.Sprintf("hello %s from %s", in.Name, s.addr)}, nil

View File

@ -11,7 +11,7 @@ import (
"google.golang.org/grpc/status"
"github.com/bilibili/kratos/pkg/ecode"
"github.com/bilibili/kratos/pkg/ecode/pb"
"github.com/bilibili/kratos/pkg/net/rpc/warden/internal/pb"
)
// togRPCCode convert ecode.Codo to gRPC code

View File

@ -15,7 +15,7 @@ import (
"google.golang.org/grpc/status"
"github.com/bilibili/kratos/pkg/ecode"
"github.com/bilibili/kratos/pkg/ecode/pb"
"github.com/bilibili/kratos/pkg/net/rpc/warden/internal/pb"
)
func TestCodeConvert(t *testing.T) {