code style

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) {

infra/conf/dns.go

@@ -6,15 +6,13 @@ import (
 	"sort"
 	"strings"
 
+	"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"
-
-	"github.com/v2fly/v2ray-core/v4/app/dns"
-	"github.com/v2fly/v2ray-core/v4/app/router"
-	"github.com/v2fly/v2ray-core/v4/common/net"
 )
 
 type NameServerConfig struct {

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"
 )
 

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"
 )
 

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"
 )
 

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

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 (

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

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"
 )
 

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 {

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() {

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"
 )
 

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"
 )
 

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"

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"

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"
 )
 

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 (

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"

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"