Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
73067fd2
Commit
73067fd2
authored
Nov 30, 2017
by
Zach
Committed by
Felix Lange
Nov 30, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
buld: enable goconst linter (#15566)
parent
e37f7be9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
ci.go
build/ci.go
+9
-1
manifest.go
cmd/swarm/manifest.go
+5
-3
No files found.
build/ci.go
View file @
73067fd2
...
...
@@ -323,7 +323,15 @@ func doLint(cmdline []string) {
build
.
MustRunCommand
(
filepath
.
Join
(
GOBIN
,
"gometalinter.v1"
),
"--install"
)
// Run fast linters batched together
configs
:=
[]
string
{
"--vendor"
,
"--disable-all"
,
"--enable=vet"
,
"--enable=gofmt"
,
"--enable=misspell"
}
configs
:=
[]
string
{
"--vendor"
,
"--disable-all"
,
"--enable=vet"
,
"--enable=gofmt"
,
"--enable=misspell"
,
"--enable=goconst"
,
"--min-occurrences=6"
,
// for goconst
}
build
.
MustRunCommand
(
filepath
.
Join
(
GOBIN
,
"gometalinter.v1"
),
append
(
configs
,
packages
...
)
...
)
// Run slow linters one by one
...
...
cmd/swarm/manifest.go
View file @
73067fd2
...
...
@@ -30,6 +30,8 @@ import (
"gopkg.in/urfave/cli.v1"
)
const
bzzManifestJSON
=
"application/bzz-manifest+json"
func
add
(
ctx
*
cli
.
Context
)
{
args
:=
ctx
.
Args
()
if
len
(
args
)
<
3
{
...
...
@@ -145,7 +147,7 @@ func addEntryToManifest(ctx *cli.Context, mhash, path, hash, ctype string) strin
if
path
==
entry
.
Path
{
utils
.
Fatalf
(
"Path %s already present, not adding anything"
,
path
)
}
else
{
if
entry
.
ContentType
==
"application/bzz-manifest+json"
{
if
entry
.
ContentType
==
bzzManifestJSON
{
prfxlen
:=
strings
.
HasPrefix
(
path
,
entry
.
Path
)
if
prfxlen
&&
len
(
path
)
>
len
(
longestPathEntry
.
Path
)
{
longestPathEntry
=
entry
...
...
@@ -207,7 +209,7 @@ func updateEntryInManifest(ctx *cli.Context, mhash, path, hash, ctype string) st
if
path
==
entry
.
Path
{
newEntry
=
entry
}
else
{
if
entry
.
ContentType
==
"application/bzz-manifest+json"
{
if
entry
.
ContentType
==
bzzManifestJSON
{
prfxlen
:=
strings
.
HasPrefix
(
path
,
entry
.
Path
)
if
prfxlen
&&
len
(
path
)
>
len
(
longestPathEntry
.
Path
)
{
longestPathEntry
=
entry
...
...
@@ -281,7 +283,7 @@ func removeEntryFromManifest(ctx *cli.Context, mhash, path string) string {
if
path
==
entry
.
Path
{
entryToRemove
=
entry
}
else
{
if
entry
.
ContentType
==
"application/bzz-manifest+json"
{
if
entry
.
ContentType
==
bzzManifestJSON
{
prfxlen
:=
strings
.
HasPrefix
(
path
,
entry
.
Path
)
if
prfxlen
&&
len
(
path
)
>
len
(
longestPathEntry
.
Path
)
{
longestPathEntry
=
entry
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment