v3 refactor (#1868)

* Move to v3

Co-authored-by: Ben Toogood <bentoogood@gmail.com>
This commit is contained in:
Asim Aslam 2020-07-27 13:22:00 +01:00 committed by Vasiliy Tolstov
parent a384632c93
commit 046db9e178
9 changed files with 23 additions and 22 deletions

View File

@ -9,8 +9,8 @@ import (
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v3/codec"
"github.com/micro/go-micro/v3/codec/bytes"
"github.com/oxtoacart/bpool"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"

View File

@ -1,7 +1,7 @@
package grpc
import (
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v3/errors"
"google.golang.org/grpc/status"
)

12
grpc.go
View File

@ -11,12 +11,12 @@ import (
"sync/atomic"
"time"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/client"
raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v3/broker"
"github.com/micro/go-micro/v3/client"
raw "github.com/micro/go-micro/v3/codec/bytes"
"github.com/micro/go-micro/v3/errors"
"github.com/micro/go-micro/v3/metadata"
"github.com/micro/go-micro/v3/registry"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

View File

@ -5,11 +5,12 @@ import (
"net"
"testing"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/memory"
"github.com/micro/go-micro/v2/router"
"github.com/micro/go-micro/v3/client"
"github.com/micro/go-micro/v3/errors"
"github.com/micro/go-micro/v3/registry"
"github.com/micro/go-micro/v3/registry/memory"
"github.com/micro/go-micro/v3/router"
regRouter "github.com/micro/go-micro/v3/router/registry"
pgrpc "google.golang.org/grpc"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
)
@ -57,7 +58,7 @@ func TestGRPCClient(t *testing.T) {
})
// create router
rtr := router.NewRouter(router.Registry(r))
rtr := regRouter.NewRouter(router.Registry(r))
// create client
c := NewClient(client.Router(rtr))

View File

@ -1,7 +1,7 @@
package grpc
import (
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v3/client"
)
type grpcEvent struct {

View File

@ -5,7 +5,7 @@ import (
"context"
"crypto/tls"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v3/client"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"
)

View File

@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v3/client"
"github.com/micro/go-micro/v3/codec"
)
type grpcRequest struct {

View File

@ -3,8 +3,8 @@ package grpc
import (
"strings"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v3/codec"
"github.com/micro/go-micro/v3/codec/bytes"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"
)

View File

@ -5,7 +5,7 @@ import (
"io"
"sync"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v3/client"
"google.golang.org/grpc"
)