Merge branch 'melekes/bls-signature-aggregation' of github.com:meleke…

…s/bera-cometbft into melekes/bls-signature-aggregation
berachain · Jan 12, 2025 · fe2b097 · fe2b097
2 parents 4cead62 + 1217b48
commit fe2b097
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go
@@ -295,9 +295,10 @@ func signAddVotes(
 	voteType types.SignedMsgType,
 	chainID string,
 	blockID types.BlockID,
-	extEnabled bool,
+	_ bool,
 	vss ...*validatorStub,
 ) {
+	extEnabled := false // disable vote extensions in Bearchain
 	votes := signVotes(voteType, chainID, blockID, extEnabled, vss...)
 	addVotes(to, votes...)
 }

diff --git a/internal/consensus/reactor.go b/internal/consensus/reactor.go
@@ -702,7 +702,7 @@ OUTER_LOOP:
 						"height", prs.Height,
 						"commit", commit)
 				} else {
-					logger.Error("Commit should have been returned, instead unknown type %T.", c)
+					logger.Error("Commit should have been returned, instead unknown type.", "type", fmt.Sprintf("%T", c))
 				}
 			}
 		}

diff --git a/internal/test/params.go b/internal/test/params.go
@@ -8,8 +8,8 @@ import (
 // for use in testing.
 func ConsensusParams() *types.ConsensusParams {
 	c := types.DefaultConsensusParams()
-	// enable vote extensions
-	//c.Feature.VoteExtensionsEnableHeight = 1
+	// disable vote extensions
+	c.Feature.VoteExtensionsEnableHeight = 0
 	// enabled PBTS
 	c.Feature.PbtsEnableHeight = 1
 	return c