refactor all the things

louiejin92 · Dec 29, 2020 · a7c31a0 · a7c31a0
1 parent d197438
commit a7c31a0
Show file tree

Hide file tree

Showing 195 changed files with 13,897 additions and 3,390 deletions.
diff --git a/api/handler/http/http_test.go b/api/handler/http/http_test.go
@@ -12,11 +12,10 @@ import (
 	"github.com/micro/go-micro/v2/api/router"
 	regRouter "github.com/micro/go-micro/v2/api/router/registry"
 	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/v2/registry/memory"
 )
 
 func testHttp(t *testing.T, path, service, ns string) {
-	r := memory.NewRegistry()
+	r := registry.NewMemoryRegistry()
 
 	l, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {

diff --git a/api/handler/options.go b/api/handler/options.go
@@ -3,7 +3,6 @@ package handler
 import (
 	"github.com/micro/go-micro/v2/api/router"
 	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/v2/client/grpc"
 )
 
 var (
@@ -27,7 +26,7 @@ func NewOptions(opts ...Option) Options {
 	}
 
 	if options.Client == nil {
-		WithClient(grpc.NewClient())(&options)
+		WithClient(client.NewClient())(&options)
 	}
 
 	// set namespace if blank

diff --git a/api/router/router_test.go b/api/router/router_test.go
diff --git a/auth/options.go b/auth/options.go
@@ -3,20 +3,13 @@ package auth
 import (
 	"context"
 	"time"
-
-	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/v2/store"
 )
 
 func NewOptions(opts ...Option) Options {
 	var options Options
 	for _, o := range opts {
 		o(&options)
 	}
-	if options.Client == nil {
-		options.Client = client.DefaultClient
-	}
-
 	return options
 }
 
@@ -33,10 +26,6 @@ type Options struct {
 	PublicKey string
 	// PrivateKey for encoding JWTs
 	PrivateKey string
-	// Store to back auth
-	Store store.Store
-	// Client to use for RPC
-	Client client.Client
 	// Addrs sets the addresses of auth
 	Addrs []string
 }
@@ -57,13 +46,6 @@ func Namespace(n string) Option {
 	}
 }
 
-// Store to back auth
-func Store(s store.Store) Option {
-	return func(o *Options) {
-		o.Store = s
-	}
-}
-
 // PublicKey is the JWT public key
 func PublicKey(key string) Option {
 	return func(o *Options) {
@@ -93,13 +75,6 @@ func ClientToken(token *Token) Option {
 	}
 }
 
-// WithClient sets the client to use when making requests
-func WithClient(c client.Client) Option {
-	return func(o *Options) {
-		o.Client = c
-	}
-}
-
 type GenerateOptions struct {
 	// Metadata associated with the account
 	Metadata map[string]string