From 2bdc86049a77b7780a4229e5a9b3c595ef46a5d3 Mon Sep 17 00:00:00 2001 From: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Tue, 4 May 2021 21:52:35 +0800 Subject: [PATCH] code style --- infra/conf/cfgcommon/common_test.go | 3 +-- infra/conf/dns.go | 10 ++++------ infra/conf/dns_proxy.go | 2 +- infra/conf/dns_test.go | 1 - infra/conf/dokodemo.go | 2 +- infra/conf/geodata/memconservative/cache.go | 3 ++- infra/conf/geodata/memconservative/decode.go | 3 ++- infra/conf/geodata/standard/standard.go | 3 +-- infra/conf/http.go | 3 +-- infra/conf/router.go | 4 +--- infra/conf/rule/rule_test.go | 3 +-- infra/conf/shadowsocks.go | 3 +-- infra/conf/socks.go | 3 +-- infra/conf/transport_authenticators.go | 3 +-- infra/conf/transport_internet.go | 3 +-- infra/conf/trojan.go | 3 +-- infra/conf/v2ray.go | 3 +-- infra/conf/vless.go | 3 +-- infra/conf/vmess.go | 3 +-- 19 files changed, 23 insertions(+), 38 deletions(-) diff --git a/infra/conf/cfgcommon/common_test.go b/infra/conf/cfgcommon/common_test.go index 5acab2bb3..ac22d9c0d 100644 --- a/infra/conf/cfgcommon/common_test.go +++ b/infra/conf/cfgcommon/common_test.go @@ -5,14 +5,13 @@ import ( "os" "testing" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" ) func TestStringListUnmarshalError(t *testing.T) { diff --git a/infra/conf/dns.go b/infra/conf/dns.go index 56b27581e..a6f6c03a3 100644 --- a/infra/conf/dns.go +++ b/infra/conf/dns.go @@ -6,15 +6,13 @@ import ( "sort" "strings" - "github.com/v2fly/v2ray-core/v4/common/platform" - - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - rule2 "github.com/v2fly/v2ray-core/v4/infra/conf/rule" - "github.com/v2fly/v2ray-core/v4/app/dns" "github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/common/platform" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" + rule2 "github.com/v2fly/v2ray-core/v4/infra/conf/rule" ) type NameServerConfig struct { diff --git a/infra/conf/dns_proxy.go b/infra/conf/dns_proxy.go index 89f0d27eb..6378abaf7 100644 --- a/infra/conf/dns_proxy.go +++ b/infra/conf/dns_proxy.go @@ -2,9 +2,9 @@ package conf import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/dns" ) diff --git a/infra/conf/dns_test.go b/infra/conf/dns_test.go index 2125bb977..29f4335a8 100644 --- a/infra/conf/dns_test.go +++ b/infra/conf/dns_test.go @@ -15,7 +15,6 @@ import ( "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" "github.com/v2fly/v2ray-core/v4/infra/conf" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" ) diff --git a/infra/conf/dokodemo.go b/infra/conf/dokodemo.go index 9072b80af..c891821d7 100644 --- a/infra/conf/dokodemo.go +++ b/infra/conf/dokodemo.go @@ -2,8 +2,8 @@ package conf import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" ) diff --git a/infra/conf/geodata/memconservative/cache.go b/infra/conf/geodata/memconservative/cache.go index 116a185f5..0632c0ad4 100644 --- a/infra/conf/geodata/memconservative/cache.go +++ b/infra/conf/geodata/memconservative/cache.go @@ -4,9 +4,10 @@ import ( "io/ioutil" "strings" + "google.golang.org/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v4/common/platform" - "google.golang.org/protobuf/proto" ) type GeoIPCache map[string]*router.GeoIP diff --git a/infra/conf/geodata/memconservative/decode.go b/infra/conf/geodata/memconservative/decode.go index 33ab1d41a..7e431ca6f 100644 --- a/infra/conf/geodata/memconservative/decode.go +++ b/infra/conf/geodata/memconservative/decode.go @@ -5,8 +5,9 @@ import ( "io" "strings" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" "google.golang.org/protobuf/encoding/protowire" + + "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" ) var ( diff --git a/infra/conf/geodata/standard/standard.go b/infra/conf/geodata/standard/standard.go index 937ac980d..056a74d05 100644 --- a/infra/conf/geodata/standard/standard.go +++ b/infra/conf/geodata/standard/standard.go @@ -3,12 +3,11 @@ package standard import ( "strings" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/infra/conf/http.go b/infra/conf/http.go index 16b7dfee0..bdbaefdb5 100644 --- a/infra/conf/http.go +++ b/infra/conf/http.go @@ -3,12 +3,11 @@ package conf import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/http" ) diff --git a/infra/conf/router.go b/infra/conf/router.go index fef67a7de..bb5c83dc7 100644 --- a/infra/conf/router.go +++ b/infra/conf/router.go @@ -5,13 +5,11 @@ import ( "encoding/json" "strings" + "github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" rule2 "github.com/v2fly/v2ray-core/v4/infra/conf/rule" - - "github.com/v2fly/v2ray-core/v4/app/router" ) type RouterRulesConfig struct { diff --git a/infra/conf/rule/rule_test.go b/infra/conf/rule/rule_test.go index e6b45bb23..671917255 100644 --- a/infra/conf/rule/rule_test.go +++ b/infra/conf/rule/rule_test.go @@ -13,9 +13,8 @@ import ( "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - "github.com/v2fly/v2ray-core/v4/infra/conf/rule" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" + "github.com/v2fly/v2ray-core/v4/infra/conf/rule" ) func init() { diff --git a/infra/conf/shadowsocks.go b/infra/conf/shadowsocks.go index 6fa703f5c..677237e99 100644 --- a/infra/conf/shadowsocks.go +++ b/infra/conf/shadowsocks.go @@ -3,12 +3,11 @@ package conf import ( "strings" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" ) diff --git a/infra/conf/socks.go b/infra/conf/socks.go index c6328ebbc..ccf8d0825 100644 --- a/infra/conf/socks.go +++ b/infra/conf/socks.go @@ -3,12 +3,11 @@ package conf import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/socks" ) diff --git a/infra/conf/transport_authenticators.go b/infra/conf/transport_authenticators.go index 4a17207b6..6134765cb 100644 --- a/infra/conf/transport_authenticators.go +++ b/infra/conf/transport_authenticators.go @@ -3,10 +3,9 @@ package conf import ( "sort" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" "github.com/v2fly/v2ray-core/v4/transport/internet/headers/noop" "github.com/v2fly/v2ray-core/v4/transport/internet/headers/srtp" diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go index f0f1e96f9..69bba2f57 100644 --- a/infra/conf/transport_internet.go +++ b/infra/conf/transport_internet.go @@ -5,13 +5,12 @@ import ( "encoding/json" "strings" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket" "github.com/v2fly/v2ray-core/v4/transport/internet/http" diff --git a/infra/conf/trojan.go b/infra/conf/trojan.go index 510667146..d2849f522 100644 --- a/infra/conf/trojan.go +++ b/infra/conf/trojan.go @@ -6,13 +6,12 @@ import ( "strconv" "syscall" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/trojan" ) diff --git a/infra/conf/v2ray.go b/infra/conf/v2ray.go index 7fdcd8a67..1e99f4bcc 100644 --- a/infra/conf/v2ray.go +++ b/infra/conf/v2ray.go @@ -6,13 +6,12 @@ import ( "os" "strings" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v4/app/stats" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" ) var ( diff --git a/infra/conf/vless.go b/infra/conf/vless.go index 0ea171ace..9967c8e1b 100644 --- a/infra/conf/vless.go +++ b/infra/conf/vless.go @@ -6,13 +6,12 @@ import ( "strconv" "syscall" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/vless" "github.com/v2fly/v2ray-core/v4/proxy/vless/inbound" "github.com/v2fly/v2ray-core/v4/proxy/vless/outbound" diff --git a/infra/conf/vmess.go b/infra/conf/vmess.go index e0ed895d4..c6a607fed 100644 --- a/infra/conf/vmess.go +++ b/infra/conf/vmess.go @@ -4,12 +4,11 @@ import ( "encoding/json" "strings" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v4/proxy/vmess" "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound"