diff --git a/common/mux/client_test.go b/common/mux/client_test.go index 967037c2c..7dc1687e1 100644 --- a/common/mux/client_test.go +++ b/common/mux/client_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/golang/mock/gomock" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/errors" "github.com/v2fly/v2ray-core/v4/common/mux" diff --git a/infra/conf/gun.go b/infra/conf/gun.go index 905e09432..7f806c860 100644 --- a/infra/conf/gun.go +++ b/infra/conf/gun.go @@ -2,6 +2,7 @@ package conf import ( "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/transport/internet/grpc" ) diff --git a/infra/conf/loopback.go b/infra/conf/loopback.go index 0cdfaf351..23723ed45 100644 --- a/infra/conf/loopback.go +++ b/infra/conf/loopback.go @@ -2,6 +2,7 @@ package conf import ( "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/proxy/loopback" ) diff --git a/testing/mocks/dns.go b/testing/mocks/dns.go index 1961578c4..92c43f6bc 100644 --- a/testing/mocks/dns.go +++ b/testing/mocks/dns.go @@ -9,6 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" + dns "github.com/v2fly/v2ray-core/v4/features/dns" ) diff --git a/testing/mocks/log.go b/testing/mocks/log.go index 436d97e7b..ef357e3fb 100644 --- a/testing/mocks/log.go +++ b/testing/mocks/log.go @@ -8,6 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" + log "github.com/v2fly/v2ray-core/v4/common/log" ) diff --git a/testing/mocks/mux.go b/testing/mocks/mux.go index e22d78798..d6f1139cc 100644 --- a/testing/mocks/mux.go +++ b/testing/mocks/mux.go @@ -8,6 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" + mux "github.com/v2fly/v2ray-core/v4/common/mux" ) diff --git a/testing/mocks/outbound.go b/testing/mocks/outbound.go index ec576b1c8..5c91d757c 100644 --- a/testing/mocks/outbound.go +++ b/testing/mocks/outbound.go @@ -9,6 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" + outbound "github.com/v2fly/v2ray-core/v4/features/outbound" ) diff --git a/testing/mocks/proxy.go b/testing/mocks/proxy.go index 0b625fc64..c01239bfc 100644 --- a/testing/mocks/proxy.go +++ b/testing/mocks/proxy.go @@ -9,6 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" + net "github.com/v2fly/v2ray-core/v4/common/net" routing "github.com/v2fly/v2ray-core/v4/features/routing" transport "github.com/v2fly/v2ray-core/v4/transport" diff --git a/transport/internet/dialer.go b/transport/internet/dialer.go index 66af2f0e5..aa2f900bb 100644 --- a/transport/internet/dialer.go +++ b/transport/internet/dialer.go @@ -2,10 +2,10 @@ package internet import ( "context" - "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/session" + "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" ) // Dialer is the interface for dialing outbound connections. diff --git a/transport/internet/grpc/dial.go b/transport/internet/grpc/dial.go index b4a82485e..d3d17c043 100644 --- a/transport/internet/grpc/dial.go +++ b/transport/internet/grpc/dial.go @@ -8,16 +8,17 @@ import ( "sync" "time" + "google.golang.org/grpc" + "google.golang.org/grpc/backoff" + "google.golang.org/grpc/connectivity" + "google.golang.org/grpc/credentials" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/grpc/encoding" "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "google.golang.org/grpc" - "google.golang.org/grpc/backoff" - "google.golang.org/grpc/connectivity" - "google.golang.org/grpc/credentials" ) func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (internet.Connection, error) { diff --git a/transport/internet/grpc/hub.go b/transport/internet/grpc/hub.go index c93081c68..e3c27149e 100644 --- a/transport/internet/grpc/hub.go +++ b/transport/internet/grpc/hub.go @@ -5,14 +5,15 @@ package grpc import ( "context" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/grpc/encoding" "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" ) type Listener struct { diff --git a/transport/internet/tagged/tagged.go b/transport/internet/tagged/tagged.go index a99a7b88d..a4bfb3e0f 100644 --- a/transport/internet/tagged/tagged.go +++ b/transport/internet/tagged/tagged.go @@ -2,6 +2,7 @@ package tagged import ( "context" + "github.com/v2fly/v2ray-core/v4/common/net" ) diff --git a/transport/internet/tagged/taggedimpl/impl.go b/transport/internet/tagged/taggedimpl/impl.go index 6d32be081..9139b0ee2 100644 --- a/transport/internet/tagged/taggedimpl/impl.go +++ b/transport/internet/tagged/taggedimpl/impl.go @@ -4,6 +4,7 @@ package taggedimpl import ( "context" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/session" diff --git a/v2ray_test.go b/v2ray_test.go index dcf692a98..df858df62 100644 --- a/v2ray_test.go +++ b/v2ray_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/golang/protobuf/proto" + . "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v4/app/proxyman"