move transport back

This commit is contained in:
Asim Aslam 2019-07-09 18:41:26 +01:00
parent 97282a5377
commit 0bf54c122f
39 changed files with 42 additions and 42 deletions

View File

@ -16,7 +16,7 @@ import (
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/metadata" "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/registry"
"google.golang.org/grpc" "google.golang.org/grpc"

View File

@ -7,7 +7,7 @@ import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/broker"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/codec" "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/registry"
) )

View File

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

View File

@ -15,7 +15,7 @@ import (
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/metadata" "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/registry"
) )

View File

@ -12,7 +12,7 @@ import (
"github.com/micro/go-micro/codec/proto" "github.com/micro/go-micro/codec/proto"
"github.com/micro/go-micro/codec/protorpc" "github.com/micro/go-micro/codec/protorpc"
"github.com/micro/go-micro/errors" "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" "github.com/micro/go-micro/registry"
) )

View File

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

View File

@ -4,8 +4,8 @@ import (
"testing" "testing"
"time" "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) { func testPool(t *testing.T, size int, ttl time.Duration) {

View File

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

View File

@ -38,10 +38,10 @@ import (
"github.com/micro/go-micro/client/selector/static" "github.com/micro/go-micro/client/selector/static"
// transports // 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 { type Cmd interface {

View File

@ -6,7 +6,7 @@ import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/broker"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/selector" "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/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/server"
) )

View File

@ -7,7 +7,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/micro/go-micro/config/options" "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" "github.com/micro/go-micro/util/addr"
) )

View File

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

View File

@ -3,7 +3,7 @@ package network
import ( import (
"github.com/micro/go-micro/config/options" "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 // Network defines a network interface. The network is a single

View File

@ -9,7 +9,7 @@ import (
"github.com/micro/go-micro/client" "github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/config/cmd" "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/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/server"
) )

View File

@ -6,7 +6,7 @@ import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec" "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/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/server"
"github.com/micro/go-micro/server/debug" "github.com/micro/go-micro/server/debug"

View File

@ -7,7 +7,7 @@ import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec" "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/registry"
"github.com/micro/go-micro/server/debug" "github.com/micro/go-micro/server/debug"
) )

View File

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

View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
"github.com/micro/go-micro/codec" "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 // testCodec is a dummy codec that only knows how to encode nil bodies

View File

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

View File

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

View File

@ -13,7 +13,7 @@ import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec"
"github.com/micro/go-micro/metadata" "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/registry"
"github.com/micro/go-micro/util/addr" "github.com/micro/go-micro/util/addr"
log "github.com/micro/go-micro/util/log" log "github.com/micro/go-micro/util/log"

View File

@ -6,7 +6,7 @@ import (
"crypto/tls" "crypto/tls"
"net" "net"
"github.com/micro/go-micro/network/transport" "github.com/micro/go-micro/transport"
maddr "github.com/micro/go-micro/util/addr" maddr "github.com/micro/go-micro/util/addr"
mnet "github.com/micro/go-micro/util/net" mnet "github.com/micro/go-micro/util/net"
mls "github.com/micro/go-micro/util/tls" mls "github.com/micro/go-micro/util/tls"
@ -14,7 +14,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "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 { type grpcTransport struct {

View File

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

View File

@ -3,8 +3,8 @@ package grpc
import ( import (
"runtime/debug" "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" "github.com/micro/go-micro/util/log"
"google.golang.org/grpc/peer" "google.golang.org/grpc/peer"
) )

View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-micro. DO NOT EDIT. // 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 package go_micro_grpc_transport

View File

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

View File

@ -1,8 +1,8 @@
package grpc package grpc
import ( 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" "google.golang.org/grpc"
) )

View File

@ -2,7 +2,7 @@
package http package http
import ( 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 // NewTransport returns a new http transport using net/http and supporting http2

View File

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

View File

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

View File

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

View File

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

View File

@ -6,7 +6,7 @@ import (
"encoding/gob" "encoding/gob"
"github.com/lucas-clemente/quic-go" "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" utls "github.com/micro/go-micro/util/tls"
) )