Skip to content

Commit

Permalink
move transport back
Browse files Browse the repository at this point in the history
  • Loading branch information
@asim
asim committed Jul 9, 2019
1 parent 97282a5 commit 0bf54c1
Show file tree
Hide file tree
Showing 39 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion client/grpc/grpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion client/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion client/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion client/rpc_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion client/rpc_codec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion client/rpc_pool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

"github.com/micro/go-micro/network/transport"
"github.com/micro/go-micro/transport"
)

type pool struct {
Expand Down
4 changes: 2 additions & 2 deletions client/rpc_pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"
"time"

"github.com/micro/go-micro/network/transport"
"github.com/micro/go-micro/network/transport/memory"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/transport/memory"
)

func testPool(t *testing.T, size int, ttl time.Duration) {
Expand Down
2 changes: 1 addition & 1 deletion client/rpc_response.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions config/cmd/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (
"github.com/micro/go-micro/client/selector/static"

// transports
"github.com/micro/go-micro/network/transport"
tgrpc "github.com/micro/go-micro/network/transport/grpc"
thttp "github.com/micro/go-micro/network/transport/http"
tmem "github.com/micro/go-micro/network/transport/memory"
"github.com/micro/go-micro/transport"
tgrpc "github.com/micro/go-micro/transport/grpc"
thttp "github.com/micro/go-micro/transport/http"
tmem "github.com/micro/go-micro/transport/memory"
)

type Cmd interface {
Expand Down
2 changes: 1 addition & 1 deletion config/cmd/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion network/default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion network/link.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion network/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion server/grpc/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion server/rpc_codec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion server/rpc_codec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/rpc_request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion server/rpc_response.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion server/rpc_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions network/transport/grpc/grpc.go → transport/grpc/grpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ 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"

"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 {
Expand Down
2 changes: 1 addition & 1 deletion network/transport/grpc/grpc_test.go → transport/grpc/grpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions network/transport/grpc/handler.go → transport/grpc/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package grpc
import (
"runtime/debug"

"github.com/micro/go-micro/network/transport"
pb "github.com/micro/go-micro/network/transport/grpc/proto"
"github.com/micro/go-micro/transport"
pb "github.com/micro/go-micro/transport/grpc/proto"
"github.com/micro/go-micro/util/log"
"google.golang.org/grpc/peer"
)
Expand Down
2 changes: 1 addition & 1 deletion ...k/transport/grpc/proto/transport.micro.go → transport/grpc/proto/transport.micro.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions network/transport/grpc/proto/transport.pb.go → transport/grpc/proto/transport.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 network/transport/grpc/proto/transport.proto → transport/grpc/proto/transport.proto
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions network/transport/grpc/socket.go → transport/grpc/socket.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package grpc

import (
"github.com/micro/go-micro/network/transport"
pb "github.com/micro/go-micro/network/transport/grpc/proto"
"github.com/micro/go-micro/transport"
pb "github.com/micro/go-micro/transport/grpc/proto"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion network/transport/http/http.go → transport/http/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion network/transport/http/http_test.go → transport/http/http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion network/transport/http/options.go → transport/http/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 network/transport/http_proxy.go → transport/http_proxy.go
View file
File renamed without changes.
0 network/transport/http_transport.go → transport/http_transport.go
View file
File renamed without changes.
0 network/transport/http_transport_test.go → transport/http_transport_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion network/transport/memory/memory.go → transport/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"
"time"

"github.com/micro/go-micro/network/transport"
"github.com/micro/go-micro/transport"
)

type memorySocket struct {
Expand Down
2 changes: 1 addition & 1 deletion network/transport/memory/memory_test.go → transport/memory/memory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 network/transport/options.go → transport/options.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion network/transport/quic/quic.go → transport/quic/quic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 network/transport/transport.go → transport/transport.go
View file
File renamed without changes.

0 comments on commit 0bf54c1

Please sign in to comment.