From 775f4d64a565cd36b08de7218cb3a0b4455c365a Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Tue, 9 Apr 2019 09:57:09 +0800 Subject: [PATCH] Update Travis (#2215) * update travis * update binutils * upgrade binutils version * remove cache * none of this works * upgrade ubuntu version * lint fixes --- .travis.yml | 3 ++- beacon-chain/core/epoch/epoch_processing.go | 1 - beacon-chain/core/epoch/epoch_processing_test.go | 2 -- beacon-chain/core/state/transition.go | 1 - beacon-chain/db/state.go | 1 + shared/prometheus/service.go | 4 +++- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a85822626..a972f2245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ sudo: false matrix: include: - os: linux - go: 1.11.x + dist: xenial + go: 1.12.x env: - lint install: diff --git a/beacon-chain/core/epoch/epoch_processing.go b/beacon-chain/core/epoch/epoch_processing.go index b4193df64..36b96a596 100644 --- a/beacon-chain/core/epoch/epoch_processing.go +++ b/beacon-chain/core/epoch/epoch_processing.go @@ -125,7 +125,6 @@ func ProcessJustification( prevEpochBoundaryAttestingBalance uint64, prevTotalBalance uint64, totalBalance uint64, - enableLogging bool, ) *pb.BeaconState { ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.state.ProcessEpoch.ProcessJustification") diff --git a/beacon-chain/core/epoch/epoch_processing_test.go b/beacon-chain/core/epoch/epoch_processing_test.go index d6615878b..54f530928 100644 --- a/beacon-chain/core/epoch/epoch_processing_test.go +++ b/beacon-chain/core/epoch/epoch_processing_test.go @@ -229,7 +229,6 @@ func TestProcessJustification_PreviousEpochJustified(t *testing.T) { 1, 1, 1, - false, /* disable logging */ ) if newState.PreviousJustifiedEpoch != 3 { @@ -256,7 +255,6 @@ func TestProcessJustification_PreviousEpochJustified(t *testing.T) { 1, 1, 1, - false, /* disable logging */ ) if newState.JustifiedEpoch != helpers.CurrentEpoch(state)-1 { t.Errorf("New state's justified epoch %d != state's epoch -2: %d", diff --git a/beacon-chain/core/state/transition.go b/beacon-chain/core/state/transition.go index 8e44c736f..6a1418ef8 100644 --- a/beacon-chain/core/state/transition.go +++ b/beacon-chain/core/state/transition.go @@ -270,7 +270,6 @@ func ProcessEpoch(ctx context.Context, state *pb.BeaconState, config *Transition prevEpochAttestingBalance, prevTotalBalance, totalBalance, - config.Logging, ) // Process crosslinks records. diff --git a/beacon-chain/db/state.go b/beacon-chain/db/state.go index beb91ae4f..b20599514 100644 --- a/beacon-chain/db/state.go +++ b/beacon-chain/db/state.go @@ -5,6 +5,7 @@ import ( "encoding/binary" "errors" "fmt" + "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/prometheus/client_golang/prometheus" diff --git a/shared/prometheus/service.go b/shared/prometheus/service.go index 8ee6fac9b..2e07d6da4 100644 --- a/shared/prometheus/service.go +++ b/shared/prometheus/service.go @@ -74,9 +74,11 @@ func (s *Service) healthzHandler(w http.ResponseWriter, _ *http.Request) { } } -func (s *Service) goroutinezHandler(w http.ResponseWriter, r *http.Request) { +func (s *Service) goroutinezHandler(w http.ResponseWriter, _ *http.Request) { stack := debug.Stack() + // #nosec G104 w.Write(stack) + // #nosec G104 pprof.Lookup("goroutine").WriteTo(w, 2) }