extra checks in BitArray methods (CON-131) (#2572)

* Also removed some unused code from BitArray
* Also fixed bugs introduced in
#2558

Author: pompon0

sei-tendermint/internal/consensus/reactor.go

@@ -598,12 +598,7 @@ func (r *Reactor) gossipVotesRoutine(ctx context.Context, ps *PeerState) error {
 // into play for liveness when there's a signature DDoS attack happening.
 func (r *Reactor) queryMaj23Routine(ctx context.Context, ps *PeerState) error {
 	stateCh := r.channels.state
-	timer := time.NewTimer(0)
 	for {
-		if _, err := utils.Recv(ctx, timer.C); err != nil {
-			return err
-		}
-
 		// TODO create more reliable copies of these
 		// structures so the following go routines don't race
 		rs := r.getRoundState()
@@ -657,6 +652,9 @@ func (r *Reactor) queryMaj23Routine(ctx context.Context, ps *PeerState) error {
 				}
 			}
 		}
+		if err := utils.Sleep(ctx, r.state.config.PeerQueryMaj23SleepDuration); err != nil {
+			return err
+		}
 	}
 }
 

sei-tendermint/libs/bits/bit_array.go

@@ -1,7 +1,6 @@
 package bits
 
 import (
-	"encoding/binary"
 	"errors"
 	"fmt"
 	"math"
@@ -139,7 +138,7 @@ func (bA *BitArray) Or(o *BitArray) *BitArray {
 	o.mtx.Lock()
 	c := bA.copyBits(tmmath.MaxInt(bA.Bits, o.Bits))
 	smaller := tmmath.MinInt(len(bA.Elems), len(o.Elems))
-	for i := 0; i < smaller; i++ {
+	for i := range smaller {
 		c.Elems[i] |= o.Elems[i]
 	}
 	bA.mtx.Unlock()
@@ -207,7 +206,7 @@ func (bA *BitArray) Sub(o *BitArray) *BitArray {
 	// If bA is longer, then skipping those iterations is equivalent
 	// to right padding with 0's
 	smaller := tmmath.MinInt(len(bA.Elems), len(o.Elems))
-	for i := 0; i < smaller; i++ {
+	for i := range smaller {
 		// &^ is and not in golang
 		c.Elems[i] &^= o.Elems[i]
 	}
@@ -216,42 +215,6 @@ func (bA *BitArray) Sub(o *BitArray) *BitArray {
 	return c
 }
 
-// IsEmpty returns true iff all bits in the bit array are 0
-func (bA *BitArray) IsEmpty() bool {
-	if bA == nil {
-		return true // should this be opposite?
-	}
-	bA.mtx.Lock()
-	defer bA.mtx.Unlock()
-	for _, e := range bA.Elems {
-		if e > 0 {
-			return false
-		}
-	}
-	return true
-}
-
-// IsFull returns true iff all bits in the bit array are 1.
-func (bA *BitArray) IsFull() bool {
-	if bA == nil {
-		return true
-	}
-	bA.mtx.Lock()
-	defer bA.mtx.Unlock()
-
-	// Check all elements except the last
-	for _, elem := range bA.Elems[:len(bA.Elems)-1] {
-		if (^elem) != 0 {
-			return false
-		}
-	}
-
-	// Check that the last element has (lastElemBits) 1's
-	lastElemBits := (bA.Bits+63)%64 + 1
-	lastElem := bA.Elems[len(bA.Elems)-1]
-	return (lastElem+1)&((uint64(1)<<uint(lastElemBits))-1) == 0
-}
-
 // PickRandom returns a random index for a set bit in the bit array.
 // If there is no such value, it returns 0, false.
 // It uses math/rand's global randomness Source to get this index.
@@ -278,6 +241,9 @@ func (bA *BitArray) PickRandom() (int, bool) {
 }
 
 func (bA *BitArray) getTrueIndices() []int {
+	if bA.Size() == 0 {
+		return nil
+	}
 	trueIndices := make([]int, 0, bA.Bits)
 	curBit := 0
 	numElems := len(bA.Elems)
@@ -288,7 +254,7 @@ func (bA *BitArray) getTrueIndices() []int {
 			curBit += 64
 			continue
 		}
-		for j := 0; j < 64; j++ {
+		for j := range 64 {
 			if (elem & (uint64(1) << uint64(j))) > 0 {
 				trueIndices = append(trueIndices, curBit)
 			}
@@ -298,7 +264,7 @@ func (bA *BitArray) getTrueIndices() []int {
 	// handle last element
 	lastElem := bA.Elems[numElems-1]
 	numFinalBits := bA.Bits - curBit
-	for i := 0; i < numFinalBits; i++ {
+	for i := range numFinalBits {
 		if (lastElem & (uint64(1) << uint64(i))) > 0 {
 			trueIndices = append(trueIndices, curBit)
 		}
@@ -354,21 +320,6 @@ func (bA *BitArray) stringIndented(indent string) string {
 	return fmt.Sprintf("BA{%v:%v}", bA.Bits, strings.Join(lines, indent))
 }
 
-// Bytes returns the byte representation of the bits within the bitarray.
-func (bA *BitArray) Bytes() []byte {
-	bA.mtx.Lock()
-	defer bA.mtx.Unlock()
-
-	numBytes := (bA.Bits + 7) / 8
-	bytes := make([]byte, numBytes)
-	for i := 0; i < len(bA.Elems); i++ {
-		elemBytes := [8]byte{}
-		binary.LittleEndian.PutUint64(elemBytes[:], bA.Elems[i])
-		copy(bytes[i*8:], elemBytes[:])
-	}
-	return bytes
-}
-
 // Update sets the bA's bits to be that of the other bit array.
 // The copying begins from the begin of both bit arrays.
 func (bA *BitArray) Update(o *BitArray) {
@@ -427,7 +378,7 @@ func (bA *BitArray) UnmarshalJSON(bz []byte) error {
 	numBits := len(bits)
 
 	bA.reset(numBits)
-	for i := 0; i < numBits; i++ {
+	for i := range numBits {
 		if bits[i] == 'x' {
 			bA.SetIndex(i, true)
 		}

sei-tendermint/libs/bits/bit_array_test.go

@@ -1,7 +1,6 @@
 package bits
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"math"
@@ -17,8 +16,8 @@ import (
 func randBitArray(bits int) *BitArray {
 	src := tmrand.Bytes((bits + 7) / 8)
 	bA := NewBitArray(bits)
-	for i := 0; i < len(src); i++ {
-		for j := 0; j < 8; j++ {
+	for i := range src {
+		for j := range 8 {
 			if i*8+j >= bits {
 				return bA
 			}
@@ -144,52 +143,6 @@ func TestPickRandom(t *testing.T) {
 	}
 }
 
-func TestBytes(t *testing.T) {
-	bA := NewBitArray(4)
-	bA.SetIndex(0, true)
-	check := func(bA *BitArray, bz []byte) {
-		require.True(t, bytes.Equal(bA.Bytes(), bz),
-			"Expected %X but got %X", bz, bA.Bytes())
-	}
-	check(bA, []byte{0x01})
-	bA.SetIndex(3, true)
-	check(bA, []byte{0x09})
-
-	bA = NewBitArray(9)
-	check(bA, []byte{0x00, 0x00})
-	bA.SetIndex(7, true)
-	check(bA, []byte{0x80, 0x00})
-	bA.SetIndex(8, true)
-	check(bA, []byte{0x80, 0x01})
-
-	bA = NewBitArray(16)
-	check(bA, []byte{0x00, 0x00})
-	bA.SetIndex(7, true)
-	check(bA, []byte{0x80, 0x00})
-	bA.SetIndex(8, true)
-	check(bA, []byte{0x80, 0x01})
-	bA.SetIndex(9, true)
-	check(bA, []byte{0x80, 0x03})
-
-	require.False(t, bA.SetIndex(-1, true))
-}
-
-func TestEmptyFull(t *testing.T) {
-	ns := []int{47, 123}
-	for _, n := range ns {
-		bA := NewBitArray(n)
-		if !bA.IsEmpty() {
-			t.Fatal("Expected bit array to be empty")
-		}
-		for i := 0; i < n; i++ {
-			bA.SetIndex(i, true)
-		}
-		if !bA.IsFull() {
-			t.Fatal("Expected bit array to be full")
-		}
-	}
-}
-
 func TestUpdateNeverPanics(t *testing.T) {
 	newRandBitArray := func(n int) *BitArray { return randBitArray(n) }
 	pairs := []struct {