lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 17:46:58 -05:00
Code Issues Releases Wiki Activity

apply coding style

Browse Source
This commit is contained in:
Shelikhoo 2021-05-04 11:21:49 +01:00
parent 6a96a9f89e
commit 19d1ff9003
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infra/conf/geodata/memconservative/cache.go
View File

@ -1,11 +1,12 @@
package memconservative package memconservative
import ( import (
"io/ioutil"
"strings"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v4/app/router"
"github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/common/platform"
"io/ioutil"
"strings"
) )
type GeoIPCache map[string]*router.GeoIP type GeoIPCache map[string]*router.GeoIP

6
infra/conf/geodata/memconservative/decode.go
View File

@ -2,10 +2,11 @@ package memconservative
import ( import (
"errors" "errors"
"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
"google.golang.org/protobuf/encoding/protowire"
"io" "io"
"strings" "strings"
"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
"google.golang.org/protobuf/encoding/protowire"
) )
var ( var (
@ -84,7 +85,6 @@ Loop:
result = container result = container
break Loop break Loop
} }
} }
return result, nil return result, nil
} }

9
infra/conf/geodata/memconservative/decode_test.go
View File

@ -2,14 +2,15 @@ package memconservative
import ( import (
"errors" "errors"
"github.com/google/go-cmp/cmp"
"github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/common/platform"
"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
"io/fs" "io/fs"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/google/go-cmp/cmp"
"github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/common/platform"
"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
) )
const ( const (

7
infra/conf/geodata/memconservative/memc.go
View File

@ -1,9 +1,10 @@
package memconservative package memconservative
import ( import (
"runtime"
"github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v4/app/router"
"github.com/v2fly/v2ray-core/v4/infra/conf/geodata" "github.com/v2fly/v2ray-core/v4/infra/conf/geodata"
"runtime"
) )
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
@ -36,7 +37,5 @@ func newMemConservativeLoader() geodata.LoaderImplementation {
} }
func init() { func init() {
geodata.RegisterGeoDataLoaderImplementationCreator("memconservative", func() geodata.LoaderImplementation { geodata.RegisterGeoDataLoaderImplementationCreator("memconservative", newMemConservativeLoader)
return newMemConservativeLoader()
})
} }