cleanup

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

server/combo/mhpb/proto_micro_http.pb.go

@@ -1,25 +1,37 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.2
+// protoc-gen-go-micro version: v3.10.4
 // source: proto.proto
 
 package pb
 
 import (
 	context "context"
-	v3 "go.unistack.org/micro-client-http/v3"
-	v31 "go.unistack.org/micro-server-http/v3"
+	v31 "go.unistack.org/micro-client-http/v3"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
 )
 
+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
+		{
+			Name:   "Test.Call",
+			Path:   "/Call",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+	}
+)
+
 type testClient struct {
 	c    client.Client
 	name string
 }
 
-func NewTestClient(name string, c client.Client) TestClient {
+func NewTestClient(name string, c client.Client) proto.TestClient {
 	return &testClient{c: c, name: name}
 }
 
@@ -27,12 +39,12 @@ func (c *testClient) Call(ctx context.Context, req *proto.CallReq, opts ...clien
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &proto.Error{}
 	opts = append(opts,
-		v3.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/Call"),
-		v3.Body("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/Call"),
+		v31.Body("*"),
 	)
 	rsp := &proto.CallRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Test.Call", req), rsp, opts...)
@@ -43,14 +55,14 @@ func (c *testClient) Call(ctx context.Context, req *proto.CallReq, opts ...clien
 }
 
 type testServer struct {
-	TestServer
+	proto.TestServer
 }
 
 func (h *testServer) Call(ctx context.Context, req *proto.CallReq, rsp *proto.CallRsp) error {
 	return h.TestServer.Call(ctx, req, rsp)
 }
 
-func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOption) error {
+func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.HandlerOption) error {
 	type test interface {
 		Call(ctx context.Context, req *proto.CallReq, rsp *proto.CallRsp) error
 	}
@@ -59,6 +71,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v31.HandlerEndpoints(TestServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }