From c62d1d5eb8be0051c773901f9c4b6f6197a7bbb4 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Sun, 23 Aug 2020 18:37:22 +0100 Subject: [PATCH] move transport (#1967) --- client/mucp/mucp.go | 2 +- client/mucp/mucp_codec.go | 2 +- client/mucp/mucp_response.go | 2 +- client/mucp/options_test.go | 2 +- client/options.go | 4 ++-- network/mucp/mucp.go | 12 ++++++------ network/options.go | 4 ++-- network/resolver/registry/registry.go | 2 +- {transport => network/transport}/grpc/grpc.go | 4 ++-- {transport => network/transport}/grpc/grpc_test.go | 2 +- {transport => network/transport}/grpc/handler.go | 4 ++-- .../transport}/grpc/proto/transport.pb.go | 0 .../transport}/grpc/proto/transport.pb.micro.go | 0 .../transport}/grpc/proto/transport.proto | 0 {transport => network/transport}/grpc/socket.go | 4 ++-- {transport => network/transport}/http/http.go | 2 +- {transport => network/transport}/http/http_proxy.go | 0 {transport => network/transport}/http/http_test.go | 2 +- .../transport}/http/http_transport_test.go | 2 +- {transport => network/transport}/http/options.go | 2 +- {transport => network/transport}/memory/memory.go | 2 +- .../transport}/memory/memory_test.go | 2 +- {transport => network/transport}/options.go | 0 {transport => network/transport}/transport.go | 0 network/tunnel/broker/broker.go | 2 +- network/tunnel/mucp/link.go | 2 +- network/tunnel/mucp/mucp.go | 2 +- network/tunnel/mucp/mucp_test.go | 2 +- network/tunnel/mucp/session.go | 2 +- network/tunnel/options.go | 4 ++-- network/tunnel/transport/listener.go | 2 +- network/tunnel/transport/transport.go | 2 +- network/tunnel/tunnel.go | 2 +- server/grpc/grpc_test.go | 2 +- server/mucp/options.go | 2 +- server/mucp/rpc_codec.go | 2 +- server/mucp/rpc_codec_test.go | 2 +- server/mucp/rpc_request.go | 2 +- server/mucp/rpc_response.go | 2 +- server/mucp/rpc_server.go | 2 +- server/mucp/subscriber.go | 2 +- server/options.go | 4 ++-- util/client/client_test.go | 2 +- util/io/io.go | 2 +- util/pool/default.go | 2 +- util/pool/default_test.go | 4 ++-- util/pool/options.go | 2 +- util/pool/pool.go | 2 +- util/socket/socket.go | 2 +- 49 files changed, 56 insertions(+), 56 deletions(-) rename {transport => network/transport}/grpc/grpc.go (96%) rename {transport => network/transport}/grpc/grpc_test.go (97%) rename {transport => network/transport}/grpc/handler.go (87%) rename {transport => network/transport}/grpc/proto/transport.pb.go (100%) rename {transport => network/transport}/grpc/proto/transport.pb.micro.go (100%) rename {transport => network/transport}/grpc/proto/transport.proto (100%) rename {transport => network/transport}/grpc/socket.go (92%) rename {transport => network/transport}/http/http.go (99%) rename {transport => network/transport}/http/http_proxy.go (100%) rename {transport => network/transport}/http/http_test.go (97%) rename {transport => network/transport}/http/http_transport_test.go (98%) rename {transport => network/transport}/http/options.go (91%) rename {transport => network/transport}/memory/memory.go (98%) rename {transport => network/transport}/memory/memory_test.go (97%) rename {transport => network/transport}/options.go (100%) rename {transport => network/transport}/transport.go (100%) diff --git a/client/mucp/mucp.go b/client/mucp/mucp.go index e92fe1dd..371e2885 100644 --- a/client/mucp/mucp.go +++ b/client/mucp/mucp.go @@ -14,7 +14,7 @@ import ( 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/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/util/buf" "github.com/micro/go-micro/v3/util/pool" ) diff --git a/client/mucp/mucp_codec.go b/client/mucp/mucp_codec.go index 14754f76..84c9f560 100644 --- a/client/mucp/mucp_codec.go +++ b/client/mucp/mucp_codec.go @@ -12,8 +12,8 @@ import ( "github.com/micro/go-micro/v3/codec/proto" "github.com/micro/go-micro/v3/codec/protorpc" "github.com/micro/go-micro/v3/errors" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/registry" - "github.com/micro/go-micro/v3/transport" ) const ( diff --git a/client/mucp/mucp_response.go b/client/mucp/mucp_response.go index 0925e5f0..80b3e767 100644 --- a/client/mucp/mucp_response.go +++ b/client/mucp/mucp_response.go @@ -2,7 +2,7 @@ package mucp import ( "github.com/micro/go-micro/v3/codec" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) type rpcResponse struct { diff --git a/client/mucp/options_test.go b/client/mucp/options_test.go index 29b76791..6330b6e5 100644 --- a/client/mucp/options_test.go +++ b/client/mucp/options_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/micro/go-micro/v3/client" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) func TestCallOptions(t *testing.T) { diff --git a/client/options.go b/client/options.go index 94f8fe94..90858cfe 100644 --- a/client/options.go +++ b/client/options.go @@ -7,13 +7,13 @@ import ( "github.com/micro/go-micro/v3/broker" "github.com/micro/go-micro/v3/broker/http" "github.com/micro/go-micro/v3/codec" + "github.com/micro/go-micro/v3/network/transport" + thttp "github.com/micro/go-micro/v3/network/transport/http" "github.com/micro/go-micro/v3/registry" "github.com/micro/go-micro/v3/router" regRouter "github.com/micro/go-micro/v3/router/registry" "github.com/micro/go-micro/v3/selector" "github.com/micro/go-micro/v3/selector/roundrobin" - "github.com/micro/go-micro/v3/transport" - thttp "github.com/micro/go-micro/v3/transport/http" ) type Options struct { diff --git a/network/mucp/mucp.go b/network/mucp/mucp.go index 12cff4f6..ebabbec3 100644 --- a/network/mucp/mucp.go +++ b/network/mucp/mucp.go @@ -16,16 +16,16 @@ import ( "github.com/micro/go-micro/v3/logger" "github.com/micro/go-micro/v3/network" pb "github.com/micro/go-micro/v3/network/mucp/proto" - "github.com/micro/go-micro/v3/proxy" - "github.com/micro/go-micro/v3/registry/noop" "github.com/micro/go-micro/v3/network/resolver/dns" - "github.com/micro/go-micro/v3/router" - "github.com/micro/go-micro/v3/server" - smucp "github.com/micro/go-micro/v3/server/mucp" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/network/tunnel" bun "github.com/micro/go-micro/v3/network/tunnel/broker" tun "github.com/micro/go-micro/v3/network/tunnel/transport" + "github.com/micro/go-micro/v3/proxy" + "github.com/micro/go-micro/v3/registry/noop" + "github.com/micro/go-micro/v3/router" + "github.com/micro/go-micro/v3/server" + smucp "github.com/micro/go-micro/v3/server/mucp" "github.com/micro/go-micro/v3/util/backoff" ) diff --git a/network/options.go b/network/options.go index f5be9de2..7c0bd6f3 100644 --- a/network/options.go +++ b/network/options.go @@ -2,12 +2,12 @@ package network import ( "github.com/google/uuid" + "github.com/micro/go-micro/v3/network/tunnel" + tmucp "github.com/micro/go-micro/v3/network/tunnel/mucp" "github.com/micro/go-micro/v3/proxy" "github.com/micro/go-micro/v3/proxy/mucp" "github.com/micro/go-micro/v3/router" regRouter "github.com/micro/go-micro/v3/router/registry" - "github.com/micro/go-micro/v3/network/tunnel" - tmucp "github.com/micro/go-micro/v3/network/tunnel/mucp" ) type Option func(*Options) diff --git a/network/resolver/registry/registry.go b/network/resolver/registry/registry.go index f9b2af2f..caacf431 100644 --- a/network/resolver/registry/registry.go +++ b/network/resolver/registry/registry.go @@ -2,9 +2,9 @@ package registry import ( + "github.com/micro/go-micro/v3/network/resolver" "github.com/micro/go-micro/v3/registry" "github.com/micro/go-micro/v3/registry/mdns" - "github.com/micro/go-micro/v3/network/resolver" ) // Resolver is a registry network resolver diff --git a/transport/grpc/grpc.go b/network/transport/grpc/grpc.go similarity index 96% rename from transport/grpc/grpc.go rename to network/transport/grpc/grpc.go index d5ee7083..0c6fbf8e 100644 --- a/transport/grpc/grpc.go +++ b/network/transport/grpc/grpc.go @@ -6,7 +6,7 @@ import ( "crypto/tls" "net" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" maddr "github.com/micro/go-micro/v3/util/addr" mnet "github.com/micro/go-micro/v3/util/net" mls "github.com/micro/go-micro/v3/util/tls" @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - pb "github.com/micro/go-micro/v3/transport/grpc/proto" + pb "github.com/micro/go-micro/v3/network/transport/grpc/proto" ) type grpcTransport struct { diff --git a/transport/grpc/grpc_test.go b/network/transport/grpc/grpc_test.go similarity index 97% rename from transport/grpc/grpc_test.go rename to network/transport/grpc/grpc_test.go index 6d577f9c..35cf9c13 100644 --- a/transport/grpc/grpc_test.go +++ b/network/transport/grpc/grpc_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) func expectedPort(t *testing.T, expected string, lsn transport.Listener) { diff --git a/transport/grpc/handler.go b/network/transport/grpc/handler.go similarity index 87% rename from transport/grpc/handler.go rename to network/transport/grpc/handler.go index 956d55cf..42405527 100644 --- a/transport/grpc/handler.go +++ b/network/transport/grpc/handler.go @@ -5,8 +5,8 @@ import ( "github.com/micro/go-micro/v3/errors" "github.com/micro/go-micro/v3/logger" - "github.com/micro/go-micro/v3/transport" - pb "github.com/micro/go-micro/v3/transport/grpc/proto" + "github.com/micro/go-micro/v3/network/transport" + pb "github.com/micro/go-micro/v3/network/transport/grpc/proto" "google.golang.org/grpc/peer" ) diff --git a/transport/grpc/proto/transport.pb.go b/network/transport/grpc/proto/transport.pb.go similarity index 100% rename from transport/grpc/proto/transport.pb.go rename to network/transport/grpc/proto/transport.pb.go diff --git a/transport/grpc/proto/transport.pb.micro.go b/network/transport/grpc/proto/transport.pb.micro.go similarity index 100% rename from transport/grpc/proto/transport.pb.micro.go rename to network/transport/grpc/proto/transport.pb.micro.go diff --git a/transport/grpc/proto/transport.proto b/network/transport/grpc/proto/transport.proto similarity index 100% rename from transport/grpc/proto/transport.proto rename to network/transport/grpc/proto/transport.proto diff --git a/transport/grpc/socket.go b/network/transport/grpc/socket.go similarity index 92% rename from transport/grpc/socket.go rename to network/transport/grpc/socket.go index d260800c..c8d180e3 100644 --- a/transport/grpc/socket.go +++ b/network/transport/grpc/socket.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/micro/go-micro/v3/transport" - pb "github.com/micro/go-micro/v3/transport/grpc/proto" + "github.com/micro/go-micro/v3/network/transport" + pb "github.com/micro/go-micro/v3/network/transport/grpc/proto" "google.golang.org/grpc" ) diff --git a/transport/http/http.go b/network/transport/http/http.go similarity index 99% rename from transport/http/http.go rename to network/transport/http/http.go index 63f3ff58..ec7b520c 100644 --- a/transport/http/http.go +++ b/network/transport/http/http.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" maddr "github.com/micro/go-micro/v3/util/addr" "github.com/micro/go-micro/v3/util/buf" mnet "github.com/micro/go-micro/v3/util/net" diff --git a/transport/http/http_proxy.go b/network/transport/http/http_proxy.go similarity index 100% rename from transport/http/http_proxy.go rename to network/transport/http/http_proxy.go diff --git a/transport/http/http_test.go b/network/transport/http/http_test.go similarity index 97% rename from transport/http/http_test.go rename to network/transport/http/http_test.go index 72b4314b..2a40ba04 100644 --- a/transport/http/http_test.go +++ b/network/transport/http/http_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) func call(b *testing.B, c int) { diff --git a/transport/http/http_transport_test.go b/network/transport/http/http_transport_test.go similarity index 98% rename from transport/http/http_transport_test.go rename to network/transport/http/http_transport_test.go index 4f26e674..c5711d77 100644 --- a/transport/http/http_transport_test.go +++ b/network/transport/http/http_transport_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) func expectedPort(t *testing.T, expected string, lsn transport.Listener) { diff --git a/transport/http/options.go b/network/transport/http/options.go similarity index 91% rename from transport/http/options.go rename to network/transport/http/options.go index 1f45dba4..0a9f9a2c 100644 --- a/transport/http/options.go +++ b/network/transport/http/options.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) // Handle registers the handler for the given pattern. diff --git a/transport/memory/memory.go b/network/transport/memory/memory.go similarity index 98% rename from transport/memory/memory.go rename to network/transport/memory/memory.go index 6d1488e5..3200df56 100644 --- a/transport/memory/memory.go +++ b/network/transport/memory/memory.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" maddr "github.com/micro/go-micro/v3/util/addr" mnet "github.com/micro/go-micro/v3/util/net" ) diff --git a/transport/memory/memory_test.go b/network/transport/memory/memory_test.go similarity index 97% rename from transport/memory/memory_test.go rename to network/transport/memory/memory_test.go index 5c53fde2..567aaa9a 100644 --- a/transport/memory/memory_test.go +++ b/network/transport/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) func TestMemoryTransport(t *testing.T) { diff --git a/transport/options.go b/network/transport/options.go similarity index 100% rename from transport/options.go rename to network/transport/options.go diff --git a/transport/transport.go b/network/transport/transport.go similarity index 100% rename from transport/transport.go rename to network/transport/transport.go diff --git a/network/tunnel/broker/broker.go b/network/tunnel/broker/broker.go index 93476471..08cc07e2 100644 --- a/network/tunnel/broker/broker.go +++ b/network/tunnel/broker/broker.go @@ -5,7 +5,7 @@ import ( "context" "github.com/micro/go-micro/v3/broker" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/network/tunnel" "github.com/micro/go-micro/v3/network/tunnel/mucp" ) diff --git a/network/tunnel/mucp/link.go b/network/tunnel/mucp/link.go index aa34f085..75879c51 100644 --- a/network/tunnel/mucp/link.go +++ b/network/tunnel/mucp/link.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/micro/go-micro/v3/logger" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) type link struct { diff --git a/network/tunnel/mucp/mucp.go b/network/tunnel/mucp/mucp.go index 8167554f..bf24c75b 100644 --- a/network/tunnel/mucp/mucp.go +++ b/network/tunnel/mucp/mucp.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/micro/go-micro/v3/logger" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/network/tunnel" ) diff --git a/network/tunnel/mucp/mucp_test.go b/network/tunnel/mucp/mucp_test.go index 919ff253..81f8b36d 100644 --- a/network/tunnel/mucp/mucp_test.go +++ b/network/tunnel/mucp/mucp_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/network/tunnel" ) diff --git a/network/tunnel/mucp/session.go b/network/tunnel/mucp/session.go index 23ea0807..0f8abe94 100644 --- a/network/tunnel/mucp/session.go +++ b/network/tunnel/mucp/session.go @@ -8,7 +8,7 @@ import ( "time" "github.com/micro/go-micro/v3/logger" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/network/tunnel" ) diff --git a/network/tunnel/options.go b/network/tunnel/options.go index 9cfb2072..50001a05 100644 --- a/network/tunnel/options.go +++ b/network/tunnel/options.go @@ -4,8 +4,8 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/v3/transport" - "github.com/micro/go-micro/v3/transport/grpc" + "github.com/micro/go-micro/v3/network/transport" + "github.com/micro/go-micro/v3/network/transport/grpc" ) var ( diff --git a/network/tunnel/transport/listener.go b/network/tunnel/transport/listener.go index 7f99cb31..3531a861 100644 --- a/network/tunnel/transport/listener.go +++ b/network/tunnel/transport/listener.go @@ -1,7 +1,7 @@ package transport import ( - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/network/tunnel" ) diff --git a/network/tunnel/transport/transport.go b/network/tunnel/transport/transport.go index 28fcff2d..b282b32e 100644 --- a/network/tunnel/transport/transport.go +++ b/network/tunnel/transport/transport.go @@ -4,7 +4,7 @@ package transport import ( "context" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/network/tunnel" "github.com/micro/go-micro/v3/network/tunnel/mucp" ) diff --git a/network/tunnel/tunnel.go b/network/tunnel/tunnel.go index 55fed2ad..7286cf90 100644 --- a/network/tunnel/tunnel.go +++ b/network/tunnel/tunnel.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) const ( diff --git a/server/grpc/grpc_test.go b/server/grpc/grpc_test.go index e53240b5..dbe157a8 100644 --- a/server/grpc/grpc_test.go +++ b/server/grpc/grpc_test.go @@ -10,13 +10,13 @@ import ( gcli "github.com/micro/go-micro/v3/client/grpc" "github.com/micro/go-micro/v3/errors" pberr "github.com/micro/go-micro/v3/errors/proto" + tgrpc "github.com/micro/go-micro/v3/network/transport/grpc" rmemory "github.com/micro/go-micro/v3/registry/memory" "github.com/micro/go-micro/v3/router" rtreg "github.com/micro/go-micro/v3/router/registry" "github.com/micro/go-micro/v3/server" gsrv "github.com/micro/go-micro/v3/server/grpc" pb "github.com/micro/go-micro/v3/server/grpc/proto" - tgrpc "github.com/micro/go-micro/v3/transport/grpc" "google.golang.org/grpc" "google.golang.org/grpc/status" ) diff --git a/server/mucp/options.go b/server/mucp/options.go index 8304c046..e61d53c3 100644 --- a/server/mucp/options.go +++ b/server/mucp/options.go @@ -3,9 +3,9 @@ package mucp import ( "github.com/micro/go-micro/v3/broker/http" "github.com/micro/go-micro/v3/codec" + thttp "github.com/micro/go-micro/v3/network/transport/http" "github.com/micro/go-micro/v3/registry/mdns" "github.com/micro/go-micro/v3/server" - thttp "github.com/micro/go-micro/v3/transport/http" ) func newOptions(opt ...server.Option) server.Options { diff --git a/server/mucp/rpc_codec.go b/server/mucp/rpc_codec.go index e0a0202a..d431484a 100644 --- a/server/mucp/rpc_codec.go +++ b/server/mucp/rpc_codec.go @@ -11,7 +11,7 @@ import ( "github.com/micro/go-micro/v3/codec/jsonrpc" "github.com/micro/go-micro/v3/codec/proto" "github.com/micro/go-micro/v3/codec/protorpc" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/oxtoacart/bpool" "github.com/pkg/errors" ) diff --git a/server/mucp/rpc_codec_test.go b/server/mucp/rpc_codec_test.go index 61a7bd9f..0f4c5a89 100644 --- a/server/mucp/rpc_codec_test.go +++ b/server/mucp/rpc_codec_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/micro/go-micro/v3/codec" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) // testCodec is a dummy codec that only knows how to encode nil bodies diff --git a/server/mucp/rpc_request.go b/server/mucp/rpc_request.go index 5520adee..b9fce65d 100644 --- a/server/mucp/rpc_request.go +++ b/server/mucp/rpc_request.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/micro/go-micro/v3/codec" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/util/buf" ) diff --git a/server/mucp/rpc_response.go b/server/mucp/rpc_response.go index 5a161d8e..6e07548b 100644 --- a/server/mucp/rpc_response.go +++ b/server/mucp/rpc_response.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/micro/go-micro/v3/codec" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) type rpcResponse struct { diff --git a/server/mucp/rpc_server.go b/server/mucp/rpc_server.go index d650b8d1..1e0f661a 100644 --- a/server/mucp/rpc_server.go +++ b/server/mucp/rpc_server.go @@ -17,9 +17,9 @@ import ( raw "github.com/micro/go-micro/v3/codec/bytes" "github.com/micro/go-micro/v3/logger" "github.com/micro/go-micro/v3/metadata" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/registry" "github.com/micro/go-micro/v3/server" - "github.com/micro/go-micro/v3/transport" "github.com/micro/go-micro/v3/util/addr" "github.com/micro/go-micro/v3/util/backoff" mnet "github.com/micro/go-micro/v3/util/net" diff --git a/server/mucp/subscriber.go b/server/mucp/subscriber.go index 903f1ffd..94419a0e 100644 --- a/server/mucp/subscriber.go +++ b/server/mucp/subscriber.go @@ -5,9 +5,9 @@ import ( "reflect" "github.com/micro/go-micro/v3/broker" + "github.com/micro/go-micro/v3/network/transport" "github.com/micro/go-micro/v3/registry" "github.com/micro/go-micro/v3/server" - "github.com/micro/go-micro/v3/transport" ) const ( diff --git a/server/options.go b/server/options.go index 59611363..39bc490e 100644 --- a/server/options.go +++ b/server/options.go @@ -11,10 +11,10 @@ import ( "github.com/micro/go-micro/v3/broker/http" "github.com/micro/go-micro/v3/codec" "github.com/micro/go-micro/v3/debug/trace" + "github.com/micro/go-micro/v3/network/transport" + thttp "github.com/micro/go-micro/v3/network/transport/http" "github.com/micro/go-micro/v3/registry" "github.com/micro/go-micro/v3/registry/mdns" - "github.com/micro/go-micro/v3/transport" - thttp "github.com/micro/go-micro/v3/transport/http" ) type Options struct { diff --git a/util/client/client_test.go b/util/client/client_test.go index aa78ab11..c13ca2bd 100644 --- a/util/client/client_test.go +++ b/util/client/client_test.go @@ -8,12 +8,12 @@ import ( bmemory "github.com/micro/go-micro/v3/broker/memory" "github.com/micro/go-micro/v3/client" "github.com/micro/go-micro/v3/client/grpc" + tmemory "github.com/micro/go-micro/v3/network/transport/memory" rmemory "github.com/micro/go-micro/v3/registry/memory" "github.com/micro/go-micro/v3/router" rtreg "github.com/micro/go-micro/v3/router/registry" "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" cw "github.com/micro/go-micro/v3/util/client" ) diff --git a/util/io/io.go b/util/io/io.go index d06bb7bb..c7e0d07f 100644 --- a/util/io/io.go +++ b/util/io/io.go @@ -4,7 +4,7 @@ package io import ( "io" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) type rwc struct { diff --git a/util/pool/default.go b/util/pool/default.go index d27350c2..bcf4c562 100644 --- a/util/pool/default.go +++ b/util/pool/default.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) type pool struct { diff --git a/util/pool/default_test.go b/util/pool/default_test.go index 20a49300..bcc7ecc2 100644 --- a/util/pool/default_test.go +++ b/util/pool/default_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/micro/go-micro/v3/transport" - "github.com/micro/go-micro/v3/transport/memory" + "github.com/micro/go-micro/v3/network/transport" + "github.com/micro/go-micro/v3/network/transport/memory" ) func testPool(t *testing.T, size int, ttl time.Duration) { diff --git a/util/pool/options.go b/util/pool/options.go index a4c3178f..7c894e0b 100644 --- a/util/pool/options.go +++ b/util/pool/options.go @@ -3,7 +3,7 @@ package pool import ( "time" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) type Options struct { diff --git a/util/pool/pool.go b/util/pool/pool.go index ce540f46..8a8dacc7 100644 --- a/util/pool/pool.go +++ b/util/pool/pool.go @@ -4,7 +4,7 @@ package pool import ( "time" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) // Pool is an interface for connection pooling diff --git a/util/socket/socket.go b/util/socket/socket.go index 4a8bc6a8..eec4b225 100644 --- a/util/socket/socket.go +++ b/util/socket/socket.go @@ -4,7 +4,7 @@ package socket import ( "io" - "github.com/micro/go-micro/v3/transport" + "github.com/micro/go-micro/v3/network/transport" ) // Socket is our pseudo socket for transport.Socket