mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-22 03:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add nogo to introduce built time linting (#2317)

Browse Source 
* Add nogo and fix lint issues

* Run gazelle

* better gazelle

* ignore external struct tags
This commit is contained in:
Preston Van Loon 2019-04-21 10:14:34 -04:00 committed by Nishant Das
parent 0499da2b95
commit 67cbf774f5
11 changed files with 111 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
BUILD.bazel
View File

@ -2,6 +2,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
load("@com_github_atlassian_bazel_tools//gometalinter:def.bzl", "gometalinter")
load("@com_github_atlassian_bazel_tools//goimports:def.bzl", "goimports")
load("@io_kubernetes_build//defs:run_in_workspace.bzl", "workspace_binary")
load("@io_bazel_rules_go//go:def.bzl", "nogo")
prefix = "github.com/prysmaticlabs/prysm"
@ -51,3 +52,40 @@ workspace_binary(
name = "golint",
cmd = "@com_github_golang_lint//golint",
)
nogo(
name = "nogo",
deps = [
"@org_golang_x_tools//go/analysis/passes/unsafeptr:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/unreachable:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/unmarshal:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/tests:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/structtag:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/stdmethods:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/shift:go_tool_library",
# "@org_golang_x_tools//go/analysis/passes/shadow:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/printf:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/pkgfact:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/nilness:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/nilfunc:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/lostcancel:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/loopclosure:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/httpresponse:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/findcall:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/ctrlflow:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/copylock:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/composite:go_tool_library",
# "@org_golang_x_tools//go/analysis/passes/cgocall:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/buildtag:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/buildssa:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/bools:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/atomicalign:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/atomic:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/assign:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/inspect:go_tool_library",
"@org_golang_x_tools//go/analysis/passes/asmdecl:go_tool_library",
],
visibility = ["//visibility:public"],
config = "nogo_config.json",
)

4
WORKSPACE
View File

@ -92,7 +92,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_to
go_rules_dependencies()
go_register_toolchains()
go_register_toolchains(nogo = "@//:nogo")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
@ -562,7 +562,7 @@ go_repository(
go_repository(
name = "com_github_jackpal_go_nat_pmp",
commit = "b977c5efcadd604e306a97fdf06ff544f785df56", # v1.0.1
commit = "d89d09f6f3329bc3c2479aa3cafd76a5aa93a35c",
importpath = "github.com/jackpal/go-nat-pmp",
)

2
beacon-chain/chaintest/backend/simulated_backend_test.go
View File

@ -47,7 +47,7 @@ func TestGenerateBlockAndAdvanceChain_IncreasesSlot(t *testing.T) {
t.Fatalf("Could not generate block and transition state successfully %v for slot %d", err, backend.state.Slot+1)
}
if backend.inMemoryBlocks[len(backend.inMemoryBlocks)-1].Slot != backend.state.Slot {
t.Errorf("In memory Blocks do not have the same last slot as the state, expected %d but got %d",
t.Errorf("In memory Blocks do not have the same last slot as the state, expected %d but got %v",
backend.state.Slot, backend.inMemoryBlocks[len(backend.inMemoryBlocks)-1])
}
}

1
beacon-chain/powchain/service.go
View File

@ -129,6 +129,7 @@ func NewWeb3Service(ctx context.Context, config *Web3ServiceConfig) (*Web3Servic
ctx, cancel := context.WithCancel(ctx)
depositTrie, err := trieutil.GenerateTrieFromItems([][]byte{{}}, int(params.BeaconConfig().DepositContractTreeDepth))
if err != nil {
cancel()
return nil, fmt.Errorf("could not setup deposit trie: %v", err)
}
return &Web3Service{

50
nogo_config.json Normal file
View File

@ -0,0 +1,50 @@
{
"unsafeptr": {
"exclude_files": {
"external/com_github_gxed_hashland/murmur3/*": "Unsafe third party code",
"external/io_k8s_apimachinery/vendor/github.com/modern-go/reflect2/reflect/*": "Unsafe third party code"
}
},
"unreachable": {
"exclude_files": {
"shared/messagehandler/messagehandler_test.go": "Necessary panic before return for test",
"external/*": "Unreachable third party code"
}
},
"nilness": {
"exclude_files": {
"external/*": "Third party code"
}
},
"stdmethods": {
"exclude_files": {
"external/*": "Third party code"
}
},
"copylocks": {
"exclude_files": {
"external/*": "Third party code"
}
},
"composites": {
"exclude_files": {
"external/*": "Third party code"
}
},
"cgocall": {
"exclude_files": {
"external/*": "Third party code"
}
},
"assign": {
"exclude_files": {
"external/*": "Third party code"
}
},
"structtag": {
"exclude_files": {
"external/*": "Third party code"
}
}
}

3
shared/p2p/monitoring.go
View File

@ -62,7 +62,8 @@ func ensurePeerConnections(ctx context.Context, h host.Host, peers ...string) {
c := h.Network().ConnsToPeer(peer.ID)
if len(c) == 0 {
log.WithField("peer", peer.ID).Debug("No connections to peer, reconnecting")
ctx, _ := context.WithTimeout(ctx, 30*time.Second)
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
if err := h.Connect(ctx, *peer); err != nil {
log.Errorf("Failed to reconnect to peer %v", err)
continue

3
shared/p2p/service.go
View File

@ -343,7 +343,8 @@ func (s *Server) Send(ctx context.Context, msg proto.Message, peerID peer.ID) er
ctx, span := trace.StartSpan(ctx, "p2p.Send")
defer span.End()
ctx, _ = context.WithTimeout(ctx, 30*time.Second)
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
topic := s.topicMapping[messageType(msg)]
pid := protocol.ID(prysmProtocolPrefix + "/" + topic)

22
shared/sliceutil/slice_generic_test.go
View File

@ -27,7 +27,7 @@ func TestGenericIntersection(t *testing.T) {
result, err := GenericIntersection(tt.setA, tt.setB)
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %d", result, tt.out)
}
}
@ -61,7 +61,7 @@ func TestGenericIntersectionWithSSZ(t *testing.T) {
result, err := GenericIntersection(b1.Bytes(), b2.Bytes())
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %d", result, tt.out)
}
}
}
@ -90,7 +90,7 @@ func TestFloatGenericIntersection(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %v", result, tt.out)
}
}
@ -112,7 +112,7 @@ func TestStringGenericIntersection(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %v", result, tt.out)
}
}
@ -140,7 +140,7 @@ func TestIntGenericIntersection(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %d", result, tt.out)
}
}
@ -167,7 +167,7 @@ func TestGenericNot(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %d", result, tt.out)
}
}
@ -193,7 +193,7 @@ func TestFloatGenericNot(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %v", result, tt.out)
}
}
@ -214,7 +214,7 @@ func TestStringGenericNot(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %v", result, tt.out)
}
}
@ -240,7 +240,7 @@ func TestIntGenericNot(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %d", result, tt.out)
}
}
@ -266,7 +266,7 @@ func TestGenericUnion(t *testing.T) {
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %d", result, tt.out)
}
}
@ -292,7 +292,7 @@ func TestFloatGenericUnion(t *testing.T) {
result, err := GenericUnion(tt.setA, tt.setB)
if err != nil {
if !reflect.DeepEqual(result, tt.out) {
t.Errorf("got %d, want %d", result, tt.out)
t.Errorf("got %v, want %v", result, tt.out)
}
}

2
tools/cluster-pk-manager/server/db.go
View File

@ -181,8 +181,6 @@ func (d *db) AssignExistingPKs(_ context.Context, pks *pb.PrivateKeys, podName s
}
return tx.Bucket(assignedPkBucket).Put([]byte(podName), data)
})
return nil
}
// AllocatedPodNames returns the string list of pod names with current private

4
validator/client/runner.go
View File

@ -62,7 +62,7 @@ func run(ctx context.Context, v Validator) {
return // Exit if context is canceled.
case slot := <-v.NextSlot():
span.AddAttributes(trace.Int64Attribute("slot", int64(slot)))
slotCtx, _ := context.WithDeadline(ctx, v.SlotDeadline(slot))
slotCtx, cancel := context.WithDeadline(ctx, v.SlotDeadline(slot))
// Report this validator client's rewards and penalties throughout its lifecycle.
if err := v.LogValidatorGainsAndLosses(slotCtx, slot); err != nil {
log.Errorf("Could not report validator's rewards/penalties for slot %d: %v",
@ -73,6 +73,7 @@ func run(ctx context.Context, v Validator) {
// epoch transition in the beacon node's state.
if err := v.UpdateAssignments(slotCtx, slot); err != nil {
handleAssignmentError(err, slot)
cancel()
continue
}
for id, role := range v.RolesAt(slot) {
@ -99,6 +100,7 @@ func run(ctx context.Context, v Validator) {
}(role, id)
}
cancel()
}
}
}

1
validator/client/service.go
View File

@ -46,6 +46,7 @@ func NewValidatorService(ctx context.Context, cfg *Config) (*ValidatorService, e
ks := keystore.NewKeystore(cfg.KeystorePath)
keys, err := ks.GetKeys(validatorFolder, validatorPrefix, cfg.Password)
if err != nil {
cancel()
return nil, fmt.Errorf("could not get private key: %v", err)
}
var key *keystore.Key