From c51ef6fc2983ce0681a530d567afc69c08ae602b Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Tue, 11 Aug 2020 11:25:49 +0100
Subject: [PATCH] move wrapper to client

---
 util/{wrapper/wrapper.go => client/client.go}          |  4 ++--
 .../{wrapper/wrapper_test.go => client/client_test.go} | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename util/{wrapper/wrapper.go => client/client.go} (88%)
 rename util/{wrapper/wrapper_test.go => client/client_test.go} (88%)

diff --git a/util/wrapper/wrapper.go b/util/client/client.go
similarity index 88%
rename from util/wrapper/wrapper.go
rename to util/client/client.go
index 83bd8910..284d801e 100644
--- a/util/wrapper/wrapper.go
+++ b/util/client/client.go
@@ -1,4 +1,4 @@
-package wrapper
+package client
 
 import (
 	"context"
@@ -20,6 +20,6 @@ func (s *staticClient) Stream(ctx context.Context, req client.Request, opts ...c
 }
 
 // StaticClient sets an address on every call
-func StaticClient(address string, c client.Client) client.Client {
+func Static(address string, c client.Client) client.Client {
 	return &staticClient{address, c}
 }
diff --git a/util/wrapper/wrapper_test.go b/util/client/client_test.go
similarity index 88%
rename from util/wrapper/wrapper_test.go
rename to util/client/client_test.go
index dafa17fe..aa78ab11 100644
--- a/util/wrapper/wrapper_test.go
+++ b/util/client/client_test.go
@@ -1,4 +1,4 @@
-package wrapper_test
+package client_test
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"github.com/micro/go-micro/v3/server"
 	grpcsrv "github.com/micro/go-micro/v3/server/grpc"
 	tmemory "github.com/micro/go-micro/v3/transport/memory"
-	wrapper "github.com/micro/go-micro/v3/util/wrapper"
+	cw "github.com/micro/go-micro/v3/util/client"
 )
 
 type TestFoo struct {
@@ -31,7 +31,7 @@ func (h *TestFoo) Bar(ctx context.Context, req *TestReq, rsp *TestRsp) error {
 	return nil
 }
 
-func TestStaticClientWrapper(t *testing.T) {
+func TestStaticClient(t *testing.T) {
 	var err error
 
 	req := grpc.NewClient().NewRequest(
@@ -68,12 +68,12 @@ func TestStaticClientWrapper(t *testing.T) {
 		client.Transport(tr),
 	)
 
-	w1 := wrapper.StaticClient("xxx_localhost:12345", cli)
+	w1 := cw.Static("xxx_localhost:12345", cli)
 	if err = w1.Call(context.TODO(), req, nil); err == nil {
 		t.Fatal("address xxx_#localhost:12345 must not exists and call must be failed")
 	}
 
-	w2 := wrapper.StaticClient(srv.Options().Address, cli)
+	w2 := cw.Static(srv.Options().Address, cli)
 	if err = w2.Call(context.TODO(), req, rsp); err != nil {
 		t.Fatal(err)
 	} else if rsp.Data != "pass" {