diff --git a/internal/state/validation_test.go b/internal/state/validation_test.go
index be1c3abb96..d3bab08967 100644
--- a/internal/state/validation_test.go
+++ b/internal/state/validation_test.go
@@ -386,7 +386,7 @@ func TestValidateBlockEvidence(t *testing.T) {
 		blockStore,
 		eventBus,
 	)
-	lastCommit := types.NewCommit(0, 0, types.BlockID{}, nil,nil)
+	lastCommit := types.NewCommit(0, 0, types.BlockID{}, nil, nil)
 
 	for height := int64(1); height < validationTestsStopHeight; height++ {
 		proposerProTxHash := state.Validators.GetProposer().ProTxHash
diff --git a/types/vote_extension.go b/types/vote_extension.go
index 888e64d0a8..784da379a5 100644
--- a/types/vote_extension.go
+++ b/types/vote_extension.go
@@ -8,14 +8,15 @@ import (
 	"math/big"
 
 	"github.com/dashpay/dashd-go/btcjson"
+	"github.com/hashicorp/go-multierror"
+	"github.com/rs/zerolog"
+
 	abci "github.com/dashpay/tenderdash/abci/types"
 	"github.com/dashpay/tenderdash/crypto"
 	"github.com/dashpay/tenderdash/crypto/bls12381"
 	"github.com/dashpay/tenderdash/internal/libs/protoio"
 	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
-	"github.com/hashicorp/go-multierror"
-	"github.com/rs/zerolog"
 )
 
 var (
@@ -367,7 +368,7 @@ func (e GenericVoteExtension) MarshalZerologObject(o *zerolog.Event) {
 	o.Hex("sign_request_id", e.GetSignRequestId())
 }
 
-//nolint:revive,stylecheck // name is the same as in protobuf-generated code
+//nolint:stylecheck // name is the same as in protobuf-generated code
 func (e GenericVoteExtension) GetSignRequestId() []byte {
 	if e.XSignRequestId == nil {
 		return nil
diff --git a/types/vote_extension_test.go b/types/vote_extension_test.go
index 735c2306ed..0bf6cdb779 100644
--- a/types/vote_extension_test.go
+++ b/types/vote_extension_test.go
@@ -8,13 +8,13 @@ import (
 	"testing"
 
 	"github.com/dashpay/dashd-go/btcjson"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/dashpay/tenderdash/crypto/bls12381"
 	tmbytes "github.com/dashpay/tenderdash/libs/bytes"
 	"github.com/dashpay/tenderdash/libs/log"
-	"github.com/dashpay/tenderdash/proto/tendermint/types"
 	tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestVoteExtensionCopySignsFromProto(t *testing.T) {
@@ -45,7 +45,7 @@ func TestMakeVoteExtensionsSignItems(t *testing.T) {
 	}{
 		{
 			vote: Vote{
-				Type:               types.PrecommitType,
+				Type:               tmproto.PrecommitType,
 				Height:             1001,
 				ValidatorProTxHash: tmbytes.MustHexDecode("9CC13F685BC3EA0FCA99B87F42ABCC934C6305AA47F62A32266A2B9D55306B7B"),
 				VoteExtensions: VoteExtensionsFromProto(&tmproto.VoteExtension{