refactor: remove consensus as a imported type in modules (backport #21480) (#21638)

Co-authored-by: Marko <marko@baricevic.me>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>

server/v2/cometbft/abci_test.go

@@ -3,11 +3,18 @@ package cometbft
 import (
 	"context"
 	"crypto/sha256"
+	"encoding/json"
 	"io"
 	"strings"
 	"testing"
 	"time"
 
+	abciproto "github.com/cometbft/cometbft/api/cometbft/abci/v1"
+	v1 "github.com/cometbft/cometbft/api/cometbft/types/v1"
+	"github.com/cosmos/gogoproto/proto"
+	gogotypes "github.com/cosmos/gogoproto/types"
+	"github.com/stretchr/testify/require"
+
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
@@ -20,16 +27,7 @@ import (
 	"cosmossdk.io/server/v2/stf"
 	"cosmossdk.io/server/v2/stf/branch"
 	"cosmossdk.io/server/v2/stf/mock"
-	abciproto "github.com/cometbft/cometbft/api/cometbft/abci/v1"
-	v1 "github.com/cometbft/cometbft/api/cometbft/types/v1"
-
-	"github.com/cosmos/gogoproto/proto"
-
-	"encoding/json"
-
 	consensustypes "cosmossdk.io/x/consensus/types"
-	gogotypes "github.com/cosmos/gogoproto/types"
-	"github.com/stretchr/testify/require"
 )
 
 var (

server/v2/cometbft/internal/mock/mock_store.go

@@ -6,7 +6,6 @@ import (
 
 	"cosmossdk.io/core/log"
 	corestore "cosmossdk.io/core/store"
-
 	storev2 "cosmossdk.io/store/v2"
 	"cosmossdk.io/store/v2/commitment"
 	"cosmossdk.io/store/v2/commitment/iavl"
@@ -17,7 +16,7 @@ import (
 )
 
 type MockStore struct {
-	Storage  storev2.VersionedDatabase
+	Storage   storev2.VersionedDatabase
 	Committer storev2.Committer
 }