Merge branch 'v0.35.x' into dependabot/go_modules/v0.35.x/github.com/spf13/cobra-1.4.0

internal/consensus/common_test.go

@@ -271,7 +271,7 @@ func signAddVotes(
 }
 
 func validatePrevote(t *testing.T, cs *State, round int32, privVal *validatorStub, blockHash []byte) {
-	prevotes := cs.Votes.Prevotes(round)
+	prevotes := cs.GetRoundState().Votes.Prevotes(round)
 	pubKey, err := privVal.GetPubKey(context.Background())
 	require.NoError(t, err)
 	address := pubKey.Address()