chore: linter

Author: rach-id

mempool/cat/reactor_test.go

@@ -3,7 +3,6 @@ package cat
 import (
 	"encoding/hex"
 	"os"
-	"sync"
 	"testing"
 	"time"
 
@@ -29,11 +28,6 @@ import (
 	"github.com/cometbft/cometbft/types"
 )
 
-const (
-	numTxs  = 10
-	timeout = 120 * time.Second // ridiculously high because CircleCI is slow
-)
-
 type peerState struct {
 	height int64
 }
@@ -373,45 +367,6 @@ func newMempoolWithAppAndConfig(cc proxy.ClientCreator, conf *cfg.Config) (*TxPo
 	return mp, func() { os.RemoveAll(conf.RootDir) }
 }
 
-func waitForTxsOnReactors(t *testing.T, txs types.Txs, reactors []*Reactor) {
-	// wait for the txs in all mempools
-	wg := new(sync.WaitGroup)
-	for i, reactor := range reactors {
-		wg.Add(1)
-		go func(r *Reactor, reactorIndex int) {
-			defer wg.Done()
-			waitForTxsOnReactor(t, txs, r, reactorIndex)
-		}(reactor, i)
-	}
-
-	done := make(chan struct{})
-	go func() {
-		wg.Wait()
-		close(done)
-	}()
-
-	timer := time.After(timeout)
-	select {
-	case <-timer:
-		t.Fatal("Timed out waiting for txs")
-	case <-done:
-	}
-}
-
-func waitForTxsOnReactor(t *testing.T, txs types.Txs, reactor *Reactor, reactorIndex int) {
-	mempool := reactor.mempool
-	for mempool.Size() < len(txs) {
-		time.Sleep(time.Millisecond * 100)
-	}
-
-	reapedTxs := mempool.ReapMaxTxs(len(txs))
-	for i, tx := range txs {
-		require.Contains(t, types.CachedTxToSliceOfBytes(reapedTxs), tx)
-		require.Equal(t, tx, reapedTxs[i].Tx,
-			"txs at index %d on reactor %d don't match: %x vs %x", i, reactorIndex, tx, reapedTxs[i])
-	}
-}
-
 func genPeers(n int) []*mocks.Peer {
 	peers := make([]*mocks.Peer, n)
 	for i := 0; i < n; i++ {

types/part_set.go

@@ -507,7 +507,7 @@ func (ps *PartSet) AddPart(part *Part) (bool, error) {
 	}
 
 	ps.mtx.Lock()
-	ps.mtx.Unlock()
+	defer ps.mtx.Unlock()
 	// The proof should be compatible with the number of parts.
 	if part.Proof.Total != int64(ps.total) {
 		return false, fmt.Errorf(ErrPartSetInvalidProofTotal.Error()+":%v %v", part.Proof.Total, ps.total)