From 9d737d60f4030e5fa68c3272b2285e61af6dd236 Mon Sep 17 00:00:00 2001 From: Victor Farazdagi Date: Tue, 5 Jan 2021 05:55:23 -0800 Subject: [PATCH] Declare err in loop to limit its scope (#8200) Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- beacon-chain/p2p/pubsub.go | 2 +- beacon-chain/p2p/utils.go | 4 ++-- beacon-chain/sync/rpc_beacon_blocks_by_range_test.go | 6 +++--- slasher/detection/detect.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/beacon-chain/p2p/pubsub.go b/beacon-chain/p2p/pubsub.go index 4740b865b81..df52fe6ed28 100644 --- a/beacon-chain/p2p/pubsub.go +++ b/beacon-chain/p2p/pubsub.go @@ -77,7 +77,7 @@ func (s *Service) SubscribeToTopic(topic string, opts ...pubsub.SubOpt) (*pubsub if featureconfig.Get().EnablePeerScorer { scoringParams := topicScoreParams(topic) if scoringParams != nil { - if err = topicHandle.SetScoreParams(scoringParams); err != nil { + if err := topicHandle.SetScoreParams(scoringParams); err != nil { return nil, err } } diff --git a/beacon-chain/p2p/utils.go b/beacon-chain/p2p/utils.go index 67924b84d2a..0a5c93de009 100644 --- a/beacon-chain/p2p/utils.go +++ b/beacon-chain/p2p/utils.go @@ -78,7 +78,7 @@ func privKey(cfg *Config) (*ecdsa.PrivateKey, error) { } dst := make([]byte, hex.EncodedLen(len(rawbytes))) hex.Encode(dst, rawbytes) - if err = fileutil.WriteFile(defaultKeyPath, dst); err != nil { + if err := fileutil.WriteFile(defaultKeyPath, dst); err != nil { return nil, err } convertedKey := convertFromInterfacePrivKey(priv) @@ -129,7 +129,7 @@ func metaDataFromConfig(cfg *Config) (*pbp2p.MetaData, error) { if err != nil { return nil, err } - if err = fileutil.WriteFile(defaultKeyPath, dst); err != nil { + if err := fileutil.WriteFile(defaultKeyPath, dst); err != nil { return nil, err } return metaData, nil diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go b/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go index 0b4ea791d1f..8b6dd3770ab 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go @@ -312,7 +312,7 @@ func TestRPCBeaconBlocksByRange_RPCHandlerRateLimitOverflow(t *testing.T) { }) stream, err := p1.BHost.NewStream(context.Background(), p2.BHost.ID(), pcl) require.NoError(t, err) - if err = r.beaconBlocksByRangeRPCHandler(context.Background(), req, stream); err != nil { + if err := r.beaconBlocksByRangeRPCHandler(context.Background(), req, stream); err != nil { return err } if testutil.WaitTimeout(&wg, 1*time.Second) { @@ -563,7 +563,7 @@ func TestRPCBeaconBlocksByRange_EnforceResponseInvariants(t *testing.T) { }) stream, err := p1.BHost.NewStream(context.Background(), p2.BHost.ID(), pcl) require.NoError(t, err) - if err = r.beaconBlocksByRangeRPCHandler(context.Background(), req, stream); err != nil { + if err := r.beaconBlocksByRangeRPCHandler(context.Background(), req, stream); err != nil { return err } if testutil.WaitTimeout(&wg, 1*time.Second) { @@ -725,7 +725,7 @@ func TestRPCBeaconBlocksByRange_FilterBlocks(t *testing.T) { }) stream, err := p1.BHost.NewStream(context.Background(), p2.BHost.ID(), pcl) require.NoError(t, err) - if err = r.beaconBlocksByRangeRPCHandler(context.Background(), req, stream); err != nil { + if err := r.beaconBlocksByRangeRPCHandler(context.Background(), req, stream); err != nil { return err } if testutil.WaitTimeout(&wg, 1*time.Second) { diff --git a/slasher/detection/detect.go b/slasher/detection/detect.go index fb3517b4b1f..3bcfd329224 100644 --- a/slasher/detection/detect.go +++ b/slasher/detection/detect.go @@ -72,7 +72,7 @@ func (ds *Service) DetectAttesterSlashings( } } if len(slashings) > 0 { - if err = ds.slasherDB.SaveAttesterSlashings(ctx, status.Active, slashings); err != nil { + if err := ds.slasherDB.SaveAttesterSlashings(ctx, status.Active, slashings); err != nil { return nil, err } }