Fix Test_createAggregatedBLSPubKeys

consensus/ibft/signer/bls.go

@@ -262,6 +262,10 @@ func extractSignerPubKeys(
 	vals validators.Validators,
 	bitMap *big.Int,
 ) ([]*bls.PublicKey, int, error) {
+	if bitMap.BitLen() == 0 {
+		return nil, 0, ErrExpectedAtLeastOneSigner
+	}
+
 	pubKeys := make([]*bls.PublicKey, 0, vals.Len())
 
 	for idx := 0; idx < vals.Len(); idx++ {

consensus/ibft/signer/bls_test.go

@@ -772,7 +772,6 @@ func Test_getBLSSignatures(t *testing.T) {
 }
 
 func Test_createAggregatedBLSPubKeys(t *testing.T) {
-	t.Skip("FIXME")
 	t.Parallel()
 
 	t.Run("multiple validators", func(t *testing.T) {
@@ -838,14 +837,14 @@ func Test_createAggregatedBLSPubKeys(t *testing.T) {
 	t.Run("should return error if bitMap is empty", func(t *testing.T) {
 		t.Parallel()
 
-		aggrecatedPubKeys, num, err := extractSignerPubKeys(
+		aggregatedPubKeys, num, err := extractSignerPubKeys(
 			validators.NewBLSValidatorSet(),
 			new(big.Int),
 		)
 
-		assert.Nil(t, aggrecatedPubKeys)
+		assert.Nil(t, aggregatedPubKeys)
 		assert.Zero(t, num)
-		assert.ErrorContains(t, err, "at least one public key is required")
+		assert.ErrorIs(t, err, ErrExpectedAtLeastOneSigner)
 	})
 
 	t.Run("should return error if public key is wrong", func(t *testing.T) {
@@ -863,7 +862,7 @@ func Test_createAggregatedBLSPubKeys(t *testing.T) {
 
 		assert.Nil(t, aggPubKeys)
 		assert.Zero(t, num)
-		assert.ErrorContains(t, err, "public key must be 48 bytes")
+		assert.ErrorIs(t, err, bls.ErrInvalidPublicKeySize)
 	})
 }
 

consensus/ibft/signer/signer.go

@@ -21,6 +21,7 @@ var (
 	ErrInvalidValidators          = errors.New("invalid validators type")
 	ErrInvalidValidator           = errors.New("invalid validator type")
 	ErrInvalidSignature           = errors.New("invalid signature")
+	ErrExpectedAtLeastOneSigner   = errors.New("expected at least one signer")
 )
 
 // Signer is responsible for signing for blocks and messages in IBFT

validators/bls.go

@@ -2,18 +2,13 @@ package validators
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 
 	"github.com/0xPolygon/polygon-edge/helper/hex"
 	"github.com/0xPolygon/polygon-edge/types"
 	"github.com/umbracle/fastrlp"
 )
 
-var (
-	ErrInvalidTypeAssert = errors.New("invalid type assert")
-)
-
 type BLSValidatorPublicKey []byte
 
 // String returns a public key in hex