move transport back

client/grpc/grpc.go

@@ -16,7 +16,7 @@ import (
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/metadata"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 
 	"google.golang.org/grpc"

client/options.go

@@ -7,7 +7,7 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 )
 

client/options_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 func TestCallOptions(t *testing.T) {

client/rpc_client.go

@@ -15,7 +15,7 @@ import (
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/metadata"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 )
 

client/rpc_codec.go

@@ -12,7 +12,7 @@ import (
 	"github.com/micro/go-micro/codec/proto"
 	"github.com/micro/go-micro/codec/protorpc"
 	"github.com/micro/go-micro/errors"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 )
 

client/rpc_pool.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 type pool struct {

client/rpc_pool_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
-	"github.com/micro/go-micro/network/transport/memory"
+	"github.com/micro/go-micro/transport/memory"
 )
 
 func testPool(t *testing.T, size int, ttl time.Duration) {

client/rpc_response.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 type rpcResponse struct {

config/cmd/cmd.go

@@ -38,10 +38,10 @@ import (
 	"github.com/micro/go-micro/client/selector/static"
 
 	// transports
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
-	tgrpc "github.com/micro/go-micro/network/transport/grpc"
+	tgrpc "github.com/micro/go-micro/transport/grpc"
-	thttp "github.com/micro/go-micro/network/transport/http"
+	thttp "github.com/micro/go-micro/transport/http"
-	tmem "github.com/micro/go-micro/network/transport/memory"
+	tmem "github.com/micro/go-micro/transport/memory"
 )
 
 type Cmd interface {

config/cmd/options.go

@@ -6,7 +6,7 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/client/selector"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server"
 )

network/default.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/micro/go-micro/config/options"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/util/addr"
 )
 

network/link.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/google/uuid"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 type link struct {

network/network.go

@@ -3,7 +3,7 @@ package network
 
 import (
 	"github.com/micro/go-micro/config/options"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 // Network defines a network interface. The network is a single

options.go

@@ -9,7 +9,7 @@ import (
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/config/cmd"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server"
 )

server/grpc/options.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server"
 	"github.com/micro/go-micro/server/debug"

server/options.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server/debug"
 )

server/rpc_codec.go

@@ -10,7 +10,7 @@ import (
 	"github.com/micro/go-micro/codec/jsonrpc"
 	"github.com/micro/go-micro/codec/proto"
 	"github.com/micro/go-micro/codec/protorpc"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/pkg/errors"
 )
 

server/rpc_codec_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 // testCodec is a dummy codec that only knows how to encode nil bodies

server/rpc_request.go

@@ -2,7 +2,7 @@ package server
 
 import (
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 type rpcRequest struct {

server/rpc_response.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 type rpcResponse struct {

server/rpc_server.go

@@ -13,7 +13,7 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/metadata"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/util/addr"
 	log "github.com/micro/go-micro/util/log"

transport/grpc/grpc.go

@@ -6,7 +6,7 @@ import (
 	"crypto/tls"
 	"net"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	maddr "github.com/micro/go-micro/util/addr"
 	mnet "github.com/micro/go-micro/util/net"
 	mls "github.com/micro/go-micro/util/tls"
@@ -14,7 +14,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	pb "github.com/micro/go-micro/network/transport/grpc/proto"
+	pb "github.com/micro/go-micro/transport/grpc/proto"
 )
 
 type grpcTransport struct {

transport/grpc/grpc_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 func expectedPort(t *testing.T, expected string, lsn transport.Listener) {

transport/grpc/handler.go

@@ -3,8 +3,8 @@ package grpc
 import (
 	"runtime/debug"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
-	pb "github.com/micro/go-micro/network/transport/grpc/proto"
+	pb "github.com/micro/go-micro/transport/grpc/proto"
 	"github.com/micro/go-micro/util/log"
 	"google.golang.org/grpc/peer"
 )

transport/grpc/proto/transport.micro.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: go-micro/network/transport/grpc/proto/transport.proto
+// source: go-micro/transport/grpc/proto/transport.proto
 
 package go_micro_grpc_transport
 

transport/grpc/proto/transport.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: go-micro/network/transport/grpc/proto/transport.proto
+// source: go-micro/transport/grpc/proto/transport.proto
 
 package go_micro_grpc_transport
 
@@ -75,7 +75,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("go-micro/network/transport/grpc/proto/transport.proto", fileDescriptor_29b90b9ccd5e0da5)
+	proto.RegisterFile("go-micro/transport/grpc/proto/transport.proto", fileDescriptor_29b90b9ccd5e0da5)
 }
 
 var fileDescriptor_29b90b9ccd5e0da5 = []byte{
@@ -197,5 +197,5 @@ var _Transport_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "go-micro/network/transport/grpc/proto/transport.proto",
+	Metadata: "go-micro/transport/grpc/proto/transport.proto",
 }

transport/grpc/socket.go

@@ -1,8 +1,8 @@
 package grpc
 
 import (
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
-	pb "github.com/micro/go-micro/network/transport/grpc/proto"
+	pb "github.com/micro/go-micro/transport/grpc/proto"
 	"google.golang.org/grpc"
 )
 

transport/http/http.go

@@ -2,7 +2,7 @@
 package http
 
 import (
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 // NewTransport returns a new http transport using net/http and supporting http2

transport/http/http_test.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 func call(b *testing.B, c int) {

transport/http/options.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 // Handle registers the handler for the given pattern.

transport/memory/memory.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 type memorySocket struct {

transport/memory/memory_test.go

@@ -3,7 +3,7 @@ package memory
 import (
 	"testing"
 
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 )
 
 func TestMemoryTransport(t *testing.T) {

transport/quic/quic.go

@@ -6,7 +6,7 @@ import (
 	"encoding/gob"
 
 	"github.com/lucas-clemente/quic-go"
-	"github.com/micro/go-micro/network/transport"
+	"github.com/micro/go-micro/transport"
 	utls "github.com/micro/go-micro/util/tls"
 )