add to golangci-lint modernize

.golangci.yml

@@ -40,6 +40,7 @@ linters:
     - intrange
     - loggercheck
     - misspell
+    - modernize
     - nilerr
     - noctx
     - nolintlint

internal/bft/heartbeatmonitor_test.go

@@ -58,8 +58,8 @@ func TestHeartbeatMonitorLeader(t *testing.T) {
 	vs.Store(bft.ViewSequence{ViewActive: true})
 	hm := bft.NewHeartbeatMonitor(scheduler, log, types.DefaultConfig.LeaderHeartbeatTimeout, types.DefaultConfig.LeaderHeartbeatCount, comm, 4, handler, vs, types.DefaultConfig.NumOfTicksBehindBeforeSyncing)
 
-	var heartBeatsSent uint32
-	var heartBeatsSentUntilViewBecomesInactive uint32
+	var heartBeatsSent atomic.Uint32
+	var heartBeatsSentUntilViewBecomesInactive atomic.Uint32
 
 	var toWG1 sync.WaitGroup
 	toWG1.Add(10)
@@ -68,17 +68,17 @@ func TestHeartbeatMonitorLeader(t *testing.T) {
 	comm.On("BroadcastConsensus", mock.AnythingOfType("*smartbftprotos.Message")).Run(func(args mock.Arguments) {
 		msg := args[0].(*smartbftprotos.Message)
 		view := msg.GetHeartBeat().GetView()
-		atomic.AddUint32(&heartBeatsSent, 1)
+		heartBeatsSent.Add(1)
 		if uint64(10) == view {
 			toWG1.Done()
 		} else if uint64(20) == view {
 			toWG2.Done()
-			totalHBsSent := atomic.LoadUint32(&heartBeatsSent)
+			totalHBsSent := heartBeatsSent.Load()
 			if totalHBsSent == 20 {
 				// View is stopped
 				vs.Store(bft.ViewSequence{ViewActive: false, ProposalSeq: msg.GetHeartBeat().GetSeq()})
 				// Record HB number we sent so far
-				atomic.StoreUint32(&heartBeatsSentUntilViewBecomesInactive, totalHBsSent)
+				heartBeatsSentUntilViewBecomesInactive.Store(totalHBsSent)
 			}
 		}
 	}).Return()
@@ -94,7 +94,7 @@ func TestHeartbeatMonitorLeader(t *testing.T) {
 
 	clock.advanceTime(10, scheduler)
 	// Ensure we don't advance heartbeats any longer when view is inactive
-	require.Equal(t, atomic.LoadUint32(&heartBeatsSentUntilViewBecomesInactive), atomic.LoadUint32(&heartBeatsSent))
+	require.Equal(t, heartBeatsSentUntilViewBecomesInactive.Load(), heartBeatsSent.Load())
 
 	hm.Close()
 }

internal/bft/util_test.go

@@ -159,9 +159,7 @@ func TestViewDataInFlightWhileStored(t *testing.T) {
 
 	done := make(chan struct{})
 	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		for i := 0; ; i++ {
 			select {
 			case <-done:
@@ -173,7 +171,7 @@ func TestViewDataInFlightWhileStored(t *testing.T) {
 				vc.InFlight.StorePrepares(0, 0)
 			}
 		}
-	}()
+	})
 
 	inconsistent := 0
 	for range 100000 {

internal/bft/view_test.go

@@ -1483,21 +1483,21 @@ func newNetwork(t *testing.T, size int) testedNetwork {
 }
 
 type testedView struct {
-	offline   uint32
+	offline   atomic.Uint32
 	deciderWG sync.WaitGroup
 	*bft.View
 }
 
 func (tv *testedView) setOffline() {
-	atomic.StoreUint32(&tv.offline, 1)
+	tv.offline.Store(1)
 }
 
 func (tv *testedView) setOnline() {
-	atomic.StoreUint32(&tv.offline, 0)
+	tv.offline.Store(0)
 }
 
 func (tv *testedView) HandleMessage(sender uint64, m *protos.Message) {
-	if atomic.LoadUint32(&tv.offline) == uint32(1) {
+	if tv.offline.Load() == uint32(1) {
 		return
 	}
 	tv.View.HandleMessage(sender, m)

pkg/consensus/consensus.go

@@ -64,7 +64,7 @@ type Consensus struct {
 	consensusLock sync.RWMutex
 
 	reconfigChan chan types.Reconfig
-	running      uint64
+	running      atomic.Uint64
 }
 
 func (c *Consensus) Complain(viewNum uint64, stopView bool) {
@@ -99,7 +99,7 @@ func (c *Consensus) Sync() types.SyncResponse {
 
 // GetLeaderID returns the current leader ID or zero if Consensus is not running
 func (c *Consensus) GetLeaderID() uint64 {
-	if atomic.LoadUint64(&c.running) == 0 {
+	if c.running.Load() == 0 {
 		return 0
 	}
 	return c.controller.GetLeaderID()
@@ -159,15 +159,15 @@ func (c *Consensus) Start() error {
 
 	c.startComponents(view, seq, dec, c.Verifier.VerificationSequence(), true)
 
-	atomic.StoreUint64(&c.running, 1)
+	c.running.Store(1)
 
 	return nil
 }
 
 func (c *Consensus) run() {
 	defer func() {
 		c.Logger.Infof("Exiting consensus run; ID: %d", c.Config.SelfID)
-		atomic.StoreUint64(&c.running, 0)
+		c.running.Store(0)
 		c.Stop()
 	}()