From 1dc9b40b9050caff44cde6a7e5368eb07d475ad4 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Fri, 11 Dec 2020 21:42:31 +0000 Subject: [PATCH] move network/tunnel --- network/default.go | 6 +++--- network/options.go | 2 +- {tunnel => network/tunnel}/broker/broker.go | 2 +- {tunnel => network/tunnel}/crypto.go | 0 {tunnel => network/tunnel}/crypto_test.go | 0 {tunnel => network/tunnel}/default.go | 0 {tunnel => network/tunnel}/link.go | 0 {tunnel => network/tunnel}/listener.go | 0 {tunnel => network/tunnel}/options.go | 0 {tunnel => network/tunnel}/session.go | 0 {tunnel => network/tunnel}/transport/listener.go | 2 +- {tunnel => network/tunnel}/transport/transport.go | 2 +- {tunnel => network/tunnel}/tunnel.go | 0 {tunnel => network/tunnel}/tunnel_test.go | 0 14 files changed, 7 insertions(+), 7 deletions(-) rename {tunnel => network/tunnel}/broker/broker.go (98%) rename {tunnel => network/tunnel}/crypto.go (100%) rename {tunnel => network/tunnel}/crypto_test.go (100%) rename {tunnel => network/tunnel}/default.go (100%) rename {tunnel => network/tunnel}/link.go (100%) rename {tunnel => network/tunnel}/listener.go (100%) rename {tunnel => network/tunnel}/options.go (100%) rename {tunnel => network/tunnel}/session.go (100%) rename {tunnel => network/tunnel}/transport/listener.go (90%) rename {tunnel => network/tunnel}/transport/transport.go (97%) rename {tunnel => network/tunnel}/tunnel.go (100%) rename {tunnel => network/tunnel}/tunnel_test.go (100%) diff --git a/network/default.go b/network/default.go index f777b8c4..516c535d 100644 --- a/network/default.go +++ b/network/default.go @@ -24,9 +24,9 @@ import ( "github.com/micro/go-micro/v2/server" smucp "github.com/micro/go-micro/v2/server/mucp" "github.com/micro/go-micro/v2/transport" - "github.com/micro/go-micro/v2/tunnel" - bun "github.com/micro/go-micro/v2/tunnel/broker" - tun "github.com/micro/go-micro/v2/tunnel/transport" + "github.com/micro/go-micro/v2/network/tunnel" + bun "github.com/micro/go-micro/v2/network/tunnel/broker" + tun "github.com/micro/go-micro/v2/network/tunnel/transport" "github.com/micro/go-micro/v2/util/backoff" pbUtil "github.com/micro/go-micro/v2/util/proto" ) diff --git a/network/options.go b/network/options.go index 084dce63..0153f1fd 100644 --- a/network/options.go +++ b/network/options.go @@ -7,7 +7,7 @@ import ( "github.com/micro/go-micro/v2/proxy" "github.com/micro/go-micro/v2/proxy/mucp" "github.com/micro/go-micro/v2/router" - "github.com/micro/go-micro/v2/tunnel" + "github.com/micro/go-micro/v2/network/tunnel" ) type Option func(*Options) diff --git a/tunnel/broker/broker.go b/network/tunnel/broker/broker.go similarity index 98% rename from tunnel/broker/broker.go rename to network/tunnel/broker/broker.go index 259115dd..eb0a6a05 100644 --- a/tunnel/broker/broker.go +++ b/network/tunnel/broker/broker.go @@ -6,7 +6,7 @@ import ( "github.com/micro/go-micro/v2/broker" "github.com/micro/go-micro/v2/transport" - "github.com/micro/go-micro/v2/tunnel" + "github.com/micro/go-micro/v2/network/tunnel" ) type tunBroker struct { diff --git a/tunnel/crypto.go b/network/tunnel/crypto.go similarity index 100% rename from tunnel/crypto.go rename to network/tunnel/crypto.go diff --git a/tunnel/crypto_test.go b/network/tunnel/crypto_test.go similarity index 100% rename from tunnel/crypto_test.go rename to network/tunnel/crypto_test.go diff --git a/tunnel/default.go b/network/tunnel/default.go similarity index 100% rename from tunnel/default.go rename to network/tunnel/default.go diff --git a/tunnel/link.go b/network/tunnel/link.go similarity index 100% rename from tunnel/link.go rename to network/tunnel/link.go diff --git a/tunnel/listener.go b/network/tunnel/listener.go similarity index 100% rename from tunnel/listener.go rename to network/tunnel/listener.go diff --git a/tunnel/options.go b/network/tunnel/options.go similarity index 100% rename from tunnel/options.go rename to network/tunnel/options.go diff --git a/tunnel/session.go b/network/tunnel/session.go similarity index 100% rename from tunnel/session.go rename to network/tunnel/session.go diff --git a/tunnel/transport/listener.go b/network/tunnel/transport/listener.go similarity index 90% rename from tunnel/transport/listener.go rename to network/tunnel/transport/listener.go index 337ab72a..8b22a781 100644 --- a/tunnel/transport/listener.go +++ b/network/tunnel/transport/listener.go @@ -2,7 +2,7 @@ package transport import ( "github.com/micro/go-micro/v2/transport" - "github.com/micro/go-micro/v2/tunnel" + "github.com/micro/go-micro/v2/network/tunnel" ) type tunListener struct { diff --git a/tunnel/transport/transport.go b/network/tunnel/transport/transport.go similarity index 97% rename from tunnel/transport/transport.go rename to network/tunnel/transport/transport.go index 0448d969..62609d72 100644 --- a/tunnel/transport/transport.go +++ b/network/tunnel/transport/transport.go @@ -5,7 +5,7 @@ import ( "context" "github.com/micro/go-micro/v2/transport" - "github.com/micro/go-micro/v2/tunnel" + "github.com/micro/go-micro/v2/network/tunnel" ) type tunTransport struct { diff --git a/tunnel/tunnel.go b/network/tunnel/tunnel.go similarity index 100% rename from tunnel/tunnel.go rename to network/tunnel/tunnel.go diff --git a/tunnel/tunnel_test.go b/network/tunnel/tunnel_test.go similarity index 100% rename from tunnel/tunnel_test.go rename to network/tunnel/tunnel_test.go