chore: Unify bitmap length (#240)

lesnikutsa · Dec 8, 2022 · 2ca49f0 · 2ca49f0
1 parent fb7a231
commit 2ca49f0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/testutil/datagen/raw_checkpoint.go b/testutil/datagen/raw_checkpoint.go
@@ -37,7 +37,7 @@ func GenRandomRawCheckpoint() *types.RawCheckpoint {
 	return &types.RawCheckpoint{
 		EpochNum:       GenRandomEpochNum(),
 		LastCommitHash: &randomHashBytes,
-		Bitmap:         bitmap.New(13),
+		Bitmap:         bitmap.New(types.BitmapBits),
 		BlsMultiSig:    &randomBLSSig,
 	}
 }
@@ -108,7 +108,7 @@ func GenerateLegitimateRawCheckpoint(privKeys []bls12381.PrivateKey) *types.RawC
 	msgBytes := append(sdk.Uint64ToBigEndian(epochNum), lch.MustMarshal()...)
 	sigs := GenerateBLSSigs(privKeys[:signerNum], msgBytes)
 	multiSig, _ := bls12381.AggrSigList(sigs)
-	bm := bitmap.New(13)
+	bm := bitmap.New(types.BitmapBits)
 	for i := 0; i < signerNum; i++ {
 		bm.Set(i, true)
 	}

diff --git a/x/checkpointing/keeper/keeper_test.go b/x/checkpointing/keeper/keeper_test.go
@@ -123,7 +123,7 @@ func FuzzKeeperCheckpointEpoch(f *testing.F) {
 		}
 
 		// add local checkpoint, signed by the first validator
-		bm := bitmap.New(104)
+		bm := bitmap.New(types.BitmapBits)
 		bm.Set(0, true)
 		localCkptWithMeta := datagen.GenRandomRawCheckpointWithMeta()
 		localCkptWithMeta.Status = types.Sealed

diff --git a/x/checkpointing/types/types.go b/x/checkpointing/types/types.go
@@ -14,7 +14,8 @@ import (
 
 const (
 	// HashSize is the size in bytes of a hash
-	HashSize = sha256.Size
+	HashSize   = sha256.Size
+	BitmapBits = 104 // 104 bits for 104 validators at top
 )
 
 type LastCommitHash []byte
@@ -27,7 +28,7 @@ func NewCheckpoint(epochNum uint64, lch LastCommitHash) *RawCheckpoint {
 	return &RawCheckpoint{
 		EpochNum:       epochNum,
 		LastCommitHash: &lch,
-		Bitmap:         bitmap.New(104), // 13 bytes, holding 100 validators
+		Bitmap:         bitmap.New(BitmapBits), // 13 bytes, holding 100 validators
 		BlsMultiSig:    nil,
 	}
 }