chore: cleanup some todos, imports (#1223)

Signed-off-by: Pat Losoponkul <[email protected]>
hyperledger · Jun 25, 2024 · 68626ed · 68626ed
1 parent 5398a75
commit 68626ed
Show file tree

Hide file tree

Showing 49 changed files with 36 additions and 86 deletions.
diff --git a/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/DIDUrlSpec.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/model/did/DIDUrlSpec.scala
@@ -3,9 +3,7 @@ package org.hyperledger.identus.castor.core.model.did
 import org.hyperledger.identus.castor.core.util.GenUtils
 import zio.*
 import zio.test.*
-import zio.test.assert
 import zio.test.Assertion.*
-import zio.test.Assertion.isLeft
 
 object DIDUrlSpec extends ZIOSpecDefault {
   override def spec = suite("DIDUrl")(fromStringSpec)

diff --git a/castor/src/test/scala/org/hyperledger/identus/castor/core/util/GenUtils.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/util/GenUtils.scala
@@ -8,7 +8,6 @@ import org.hyperledger.identus.shared.models.Base64UrlString
 import zio.*
 import zio.test.Gen
 
-import java.net.URI
 import scala.language.implicitConversions
 
 object GenUtils {

diff --git a/...nt/service/server/src/main/scala/org/hyperledger/identus/agent/server/CloudAgentApp.scala b/...nt/service/server/src/main/scala/org/hyperledger/identus/agent/server/CloudAgentApp.scala
@@ -18,7 +18,7 @@ import org.hyperledger.identus.iam.authentication.apikey.ApiKeyAuthenticator
 import org.hyperledger.identus.iam.entity.http.EntityServerEndpoints
 import org.hyperledger.identus.iam.wallet.http.WalletManagementServerEndpoints
 import org.hyperledger.identus.issue.controller.IssueServerEndpoints
-import org.hyperledger.identus.mercury.{DidAgent, DidOps, HttpClient}
+import org.hyperledger.identus.mercury.{DidOps, HttpClient}
 import org.hyperledger.identus.oid4vci.CredentialIssuerServerEndpoints
 import org.hyperledger.identus.pollux.core.service.{CredentialService, PresentationService}
 import org.hyperledger.identus.pollux.credentialdefinition.CredentialDefinitionRegistryServerEndpoints

diff --git a/...rver/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala b/...rver/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala
@@ -19,8 +19,7 @@ import org.hyperledger.identus.mercury.*
 import org.hyperledger.identus.mercury.model.*
 import org.hyperledger.identus.mercury.model.error.TransportError
 import org.hyperledger.identus.mercury.protocol.presentproof.*
-import org.hyperledger.identus.mercury.protocol.reportproblem.v2.ProblemCode
-import org.hyperledger.identus.mercury.protocol.reportproblem.v2.ReportProblem
+import org.hyperledger.identus.mercury.protocol.reportproblem.v2.{ProblemCode, ReportProblem}
 import org.hyperledger.identus.pollux.core.model.*
 import org.hyperledger.identus.pollux.core.model.error.{CredentialServiceError, PresentationError}
 import org.hyperledger.identus.pollux.core.model.error.PresentationError.*

diff --git a/...gent/service/server/src/main/scala/org/hyperledger/identus/api/http/EndpointOutputs.scala b/...gent/service/server/src/main/scala/org/hyperledger/identus/api/http/EndpointOutputs.scala
@@ -1,7 +1,7 @@
 package org.hyperledger.identus.api.http
 
 import sttp.model.StatusCode
-import sttp.tapir.{oneOfVariantValueMatcher, *}
+import sttp.tapir.*
 import sttp.tapir.json.zio.jsonBody
 import sttp.tapir.EndpointOutput.OneOfVariant
 

diff --git a/...scala/org/hyperledger/identus/credentialstatus/controller/http/StatusListCredential.scala b/...scala/org/hyperledger/identus/credentialstatus/controller/http/StatusListCredential.scala
@@ -2,7 +2,6 @@ package org.hyperledger.identus.credentialstatus.controller.http
 
 import org.hyperledger.identus.api.http.Annotation
 import org.hyperledger.identus.credentialstatus.controller.http.StatusListCredential.annotations
-import org.hyperledger.identus.pollux.core.model.error.CredentialStatusListServiceError
 import org.hyperledger.identus.pollux.core.model.CredentialStatusList
 import org.hyperledger.identus.pollux.vc.jwt.StatusPurpose
 import sttp.tapir.json.zio.schemaForZioJsonValue

diff --git a/...e/server/src/main/scala/org/hyperledger/identus/didcomm/controller/DIDCommEndpoints.scala b/...e/server/src/main/scala/org/hyperledger/identus/didcomm/controller/DIDCommEndpoints.scala
@@ -3,7 +3,7 @@ package org.hyperledger.identus.didcomm.controller
 import org.hyperledger.identus.api.http.{ErrorResponse, RequestContext}
 import org.hyperledger.identus.api.http.EndpointOutputs.{basicFailuresWith, FailureVariant}
 import org.hyperledger.identus.didcomm.controller.http.DIDCommMessage
-import sttp.tapir.{endpoint, PublicEndpoint, *}
+import sttp.tapir.*
 import sttp.tapir.json.zio.jsonBody
 
 object DIDCommEndpoints {

diff --git a/...in/scala/org/hyperledger/identus/iam/authentication/apikey/AuthenticationRepository.scala b/...in/scala/org/hyperledger/identus/iam/authentication/apikey/AuthenticationRepository.scala
@@ -5,7 +5,7 @@ import io.getquill.context.json.PostgresJsonExtensions
 import io.getquill.doobie.DoobieContext
 import org.hyperledger.identus.iam.authentication.apikey.AuthenticationRepositoryError.AuthenticationCompromised
 import org.hyperledger.identus.shared.models.{Failure, StatusCode}
-import zio.{IO, *}
+import zio.*
 import zio.interop.catz.*
 
 import java.time.OffsetDateTime

diff --git a/.../src/main/scala/org/hyperledger/identus/iam/authorization/core/PermissionManagement.scala b/.../src/main/scala/org/hyperledger/identus/iam/authorization/core/PermissionManagement.scala
@@ -1,6 +1,5 @@
 package org.hyperledger.identus.iam.authorization.core
 
-import org.hyperledger.identus.agent.walletapi.model.error.EntityServiceError
 import org.hyperledger.identus.agent.walletapi.model.BaseEntity
 import org.hyperledger.identus.shared.models.{WalletAdministrationContext, WalletId}
 import zio.*

diff --git a/.../src/main/scala/org/hyperledger/identus/iam/entity/http/controller/EntityController.scala b/.../src/main/scala/org/hyperledger/identus/iam/entity/http/controller/EntityController.scala
@@ -1,6 +1,5 @@
 package org.hyperledger.identus.iam.entity.http.controller
 
-import org.hyperledger.identus.agent.walletapi.model.error.EntityServiceError
 import org.hyperledger.identus.api.http.{ErrorResponse, RequestContext}
 import org.hyperledger.identus.api.http.model.PaginationInput
 import org.hyperledger.identus.iam.entity.http.model.{CreateEntityRequest, EntityResponse, EntityResponsePage}

diff --git a/...er/src/main/scala/org/hyperledger/identus/iam/wallet/http/WalletManagementEndpoints.scala b/...er/src/main/scala/org/hyperledger/identus/iam/wallet/http/WalletManagementEndpoints.scala
@@ -2,7 +2,6 @@ package org.hyperledger.identus.iam.wallet.http
 
 import org.hyperledger.identus.api.http.{EndpointOutputs, ErrorResponse, RequestContext}
 import org.hyperledger.identus.api.http.model.PaginationInput
-import org.hyperledger.identus.api.http.EndpointOutputs.FailureVariant
 import org.hyperledger.identus.iam.authentication.admin.AdminApiKeyCredentials
 import org.hyperledger.identus.iam.authentication.admin.AdminApiKeySecurityLogic.adminApiKeyHeader
 import org.hyperledger.identus.iam.authentication.apikey.ApiKeyCredentials

diff --git a/...scala/org/hyperledger/identus/iam/wallet/http/controller/WalletManagementController.scala b/...scala/org/hyperledger/identus/iam/wallet/http/controller/WalletManagementController.scala
@@ -1,8 +1,7 @@
 package org.hyperledger.identus.iam.wallet.http.controller
 
 import org.hyperledger.identus.agent.walletapi.model.{BaseEntity, Wallet, WalletSeed}
-import org.hyperledger.identus.agent.walletapi.service.{WalletManagementService, WalletManagementServiceError}
-import org.hyperledger.identus.agent.walletapi.service.WalletManagementServiceError.TooManyPermittedWallet
+import org.hyperledger.identus.agent.walletapi.service.WalletManagementService
 import org.hyperledger.identus.api.http.{ErrorResponse, RequestContext}
 import org.hyperledger.identus.api.http.model.{CollectionStats, PaginationInput}
 import org.hyperledger.identus.api.util.PaginationUtils

diff --git a/.../server/src/main/scala/org/hyperledger/identus/issue/controller/IssueControllerImpl.scala b/.../server/src/main/scala/org/hyperledger/identus/issue/controller/IssueControllerImpl.scala
@@ -21,8 +21,7 @@ import org.hyperledger.identus.pollux.core.model.{CredentialFormat, DidCommID}
 import org.hyperledger.identus.pollux.core.model.CredentialFormat.{AnonCreds, JWT, SDJWT}
 import org.hyperledger.identus.pollux.core.model.IssueCredentialRecord.Role
 import org.hyperledger.identus.pollux.core.service.CredentialService
-import org.hyperledger.identus.shared.models.KeyId
-import org.hyperledger.identus.shared.models.WalletAccessContext
+import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext}
 import zio.{URLayer, ZIO, ZLayer}
 
 import scala.language.implicitConversions

diff --git a/...in/scala/org/hyperledger/identus/issue/controller/http/AcceptCredentialOfferRequest.scala b/...in/scala/org/hyperledger/identus/issue/controller/http/AcceptCredentialOfferRequest.scala
@@ -2,7 +2,6 @@ package org.hyperledger.identus.issue.controller.http
 
 import org.hyperledger.identus.api.http.Annotation
 import org.hyperledger.identus.issue.controller.http.AcceptCredentialOfferRequest.annotations
-import org.hyperledger.identus.shared.models.KeyId
 import sttp.tapir.{Schema, Validator}
 import sttp.tapir.Schema.annotations.{description, encodedExample, validate}
 import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}

diff --git a/...rver/src/main/scala/org/hyperledger/identus/oid4vci/CredentialIssuerServerEndpoints.scala b/...rver/src/main/scala/org/hyperledger/identus/oid4vci/CredentialIssuerServerEndpoints.scala
@@ -3,7 +3,6 @@ package org.hyperledger.identus.oid4vci
 import org.hyperledger.identus.agent.walletapi.model.BaseEntity
 import org.hyperledger.identus.api.http.ErrorResponse
 import org.hyperledger.identus.iam.authentication.{
-  AuthenticationError,
   Authenticator,
   Authorizer,
   DefaultAuthenticator,

diff --git a/.../server/src/main/scala/org/hyperledger/identus/oid4vci/domain/Openid4VCIProofJwtOps.scala b/.../server/src/main/scala/org/hyperledger/identus/oid4vci/domain/Openid4VCIProofJwtOps.scala
@@ -1,7 +1,7 @@
 package org.hyperledger.identus.oid4vci.domain
 
 import com.nimbusds.jose.{JOSEObjectType, JWSAlgorithm, JWSHeader, JWSObject, JWSSigner, Payload}
-import org.hyperledger.identus.castor.core.model.did.{DID, DIDUrl, LongFormPrismDID}
+import org.hyperledger.identus.castor.core.model.did.DIDUrl
 import org.hyperledger.identus.pollux.vc.jwt.JWT
 import org.hyperledger.identus.pollux.vc.jwt.JwtSignerImplicits.*
 import org.hyperledger.identus.shared.crypto.Secp256k1PrivateKey

diff --git a/.../src/main/scala/org/hyperledger/identus/oid4vci/service/OIDCCredentialIssuerService.scala b/.../src/main/scala/org/hyperledger/identus/oid4vci/service/OIDCCredentialIssuerService.scala
@@ -139,7 +139,6 @@ case class OIDCCredentialIssuerServiceImpl(
         .mapError(dre => InvalidProof(dre.message))
       publicKey <- JWTVerification.extractPublicKey(verificationMethod).toZIO.mapError(InvalidProof.apply)
       _ <- JWTVerification.validateEncodedJwt(jwt, publicKey).toZIO.mapError(InvalidProof.apply)
-      _ <- ZIO.succeed(println(s"JWT proof is verified: ${jwt.value}")) // TODO: remove before the release
     } yield true
   }
 

diff --git a/...in/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala b/...in/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala
@@ -14,7 +14,7 @@ import org.hyperledger.identus.pollux.core.service.PresentationService
 import org.hyperledger.identus.presentproof.controller.http.*
 import org.hyperledger.identus.presentproof.controller.PresentProofController.toDidCommID
 import org.hyperledger.identus.shared.models.WalletAccessContext
-import zio.{URLayer, ZIO, ZLayer, *}
+import zio.*
 import zio.json.*
 import zio.json.ast.Json
 

diff --git a/.../src/main/scala/org/hyperledger/identus/verification/controller/http/VcVerification.scala b/.../src/main/scala/org/hyperledger/identus/verification/controller/http/VcVerification.scala
@@ -5,7 +5,7 @@ import org.hyperledger.identus.pollux.core.service
 import org.hyperledger.identus.pollux.core.service.verification.VcVerification as ServiceVcVerification
 import sttp.tapir.Schema
 import sttp.tapir.Schema.annotations.description
-import zio.{IO, *}
+import zio.*
 import zio.json.{JsonDecoder, JsonEncoder}
 
 /** Enum representing the various types of verifications that can be performed on a verifiable credential.

diff --git a/.../server/src/test/scala/org/hyperledger/identus/agent/server/AgentInitializationSpec.scala b/.../server/src/test/scala/org/hyperledger/identus/agent/server/AgentInitializationSpec.scala
@@ -18,7 +18,7 @@ import org.hyperledger.identus.shared.models.{WalletAccessContext, WalletAdminis
 import org.hyperledger.identus.sharedtest.containers.PostgresTestContainerSupport
 import org.hyperledger.identus.test.container.DBTestUtils
 import zio.*
-import zio.test.{ZIOSpecDefault, *}
+import zio.test.*
 import zio.test.Assertion.*
 
 import java.net.{URI, URL}

diff --git a/...ice/server/src/test/scala/org/hyperledger/identus/agent/server/config/AppConfigSpec.scala b/...ice/server/src/test/scala/org/hyperledger/identus/agent/server/config/AppConfigSpec.scala
@@ -3,7 +3,7 @@ package org.hyperledger.identus.agent.server.config
 import monocle.syntax.all.*
 import org.hyperledger.identus.agent.server.SystemModule
 import zio.*
-import zio.test.{ZIOSpecDefault, *}
+import zio.test.*
 import zio.test.Assertion.*
 
 object AppConfigSpec extends ZIOSpecDefault {

diff --git a/...est/scala/org/hyperledger/identus/iam/authentication/apikey/ApiKeyAuthenticatorSpec.scala b/...est/scala/org/hyperledger/identus/iam/authentication/apikey/ApiKeyAuthenticatorSpec.scala
@@ -20,7 +20,7 @@ import org.hyperledger.identus.shared.crypto.Apollo
 import org.hyperledger.identus.shared.models.{WalletAdministrationContext, WalletId}
 import org.hyperledger.identus.sharedtest.containers.PostgresTestContainerSupport
 import zio.{Scope, ULayer, ZIO, ZLayer}
-import zio.test.{assert, Spec, TestEnvironment, ZIOSpecDefault, *}
+import zio.test.*
 import zio.test.Assertion.*
 import zio.test.TestAspect.sequential
 import zio.Runtime.removeDefaultLoggers

diff --git a/.../org/hyperledger/identus/iam/authentication/apikey/JdbcAuthenticationRepositorySpec.scala b/.../org/hyperledger/identus/iam/authentication/apikey/JdbcAuthenticationRepositorySpec.scala
@@ -3,7 +3,7 @@ package org.hyperledger.identus.iam.authentication.apikey
 import org.hyperledger.identus.container.util.MigrationAspects.migrate
 import org.hyperledger.identus.iam.authentication.apikey.AuthenticationMethodType.ApiKey
 import org.hyperledger.identus.sharedtest.containers.PostgresTestContainerSupport
-import zio.test.{TestAspect, ZIOSpecDefault, *}
+import zio.test.*
 import zio.test.Assertion.*
 import zio.test.TestAspect.*
 import zio.Runtime.removeDefaultLoggers

diff --git a/...er/identus/iam/authorization/keycloak/admin/KeycloakPermissionManagementServiceSpec.scala b/...er/identus/iam/authorization/keycloak/admin/KeycloakPermissionManagementServiceSpec.scala
@@ -1,11 +1,7 @@
 package org.hyperledger.identus.iam.authorization.keycloak.admin
 
 import org.hyperledger.identus.agent.walletapi.model.Wallet
-import org.hyperledger.identus.agent.walletapi.service.{
-  WalletManagementService,
-  WalletManagementServiceError,
-  WalletManagementServiceImpl
-}
+import org.hyperledger.identus.agent.walletapi.service.{WalletManagementService, WalletManagementServiceImpl}
 import org.hyperledger.identus.agent.walletapi.sql.{JdbcWalletNonSecretStorage, JdbcWalletSecretStorage}
 import org.hyperledger.identus.iam.authentication.oidc.*
 import org.hyperledger.identus.iam.authentication.AuthenticationError.ResourceNotPermitted

diff --git a/...r/src/test/scala/org/hyperledger/identus/pollux/schema/CredentialSchemaAnoncredSpec.scala b/...r/src/test/scala/org/hyperledger/identus/pollux/schema/CredentialSchemaAnoncredSpec.scala
@@ -10,7 +10,7 @@ import org.hyperledger.identus.pollux.credentialschema.*
 import org.hyperledger.identus.pollux.credentialschema.controller.CredentialSchemaController
 import org.hyperledger.identus.pollux.credentialschema.http.{CredentialSchemaInput, CredentialSchemaResponse}
 import sttp.client3.basicRequest
-import sttp.client3.ziojson.{asJsonAlways, *}
+import sttp.client3.ziojson.*
 import sttp.model.StatusCode
 import zio.*
 import zio.json.*

diff --git a/...rc/main/scala/org/hyperledger/identus/agent/walletapi/service/MockManagedDIDService.scala b/...rc/main/scala/org/hyperledger/identus/agent/walletapi/service/MockManagedDIDService.scala
@@ -12,7 +12,7 @@ import org.hyperledger.identus.castor.core.model.did.{
 import org.hyperledger.identus.mercury.model.DidId
 import org.hyperledger.identus.mercury.PeerDID
 import org.hyperledger.identus.shared.crypto.{Ed25519KeyPair, Secp256k1KeyPair, X25519KeyPair}
-import zio.{mock, *}
+import zio.*
 import zio.mock.*
 import zio.test.Assertion
 

diff --git a/...main/scala/org/hyperledger/identus/agent/walletapi/service/handler/DIDUpdateHandler.scala b/...main/scala/org/hyperledger/identus/agent/walletapi/service/handler/DIDUpdateHandler.scala
@@ -8,7 +8,7 @@ import org.hyperledger.identus.agent.walletapi.model.{
   UpdateManagedDIDAction,
   WalletSeed
 }
-import org.hyperledger.identus.agent.walletapi.model.error.{UpdateManagedDIDError, *}
+import org.hyperledger.identus.agent.walletapi.model.error.*
 import org.hyperledger.identus.agent.walletapi.model.error.given
 import org.hyperledger.identus.agent.walletapi.storage.{DIDNonSecretStorage, DIDSecretStorage, WalletSecretStorage}
 import org.hyperledger.identus.agent.walletapi.util.OperationFactory

diff --git a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala
@@ -1,6 +1,6 @@
 package org.hyperledger.identus.mercury
 
-import io.circe.{JsonObject, *}
+import io.circe.*
 import org.hyperledger.identus.mercury.model.*
 import org.hyperledger.identus.mercury.model.error.*
 import org.hyperledger.identus.mercury.protocol.routing.*

diff --git a/.../main/scala/org/hyperledger/identus/mercury/protocol/reportproblem/v2/ReportProblem.scala b/.../main/scala/org/hyperledger/identus/mercury/protocol/reportproblem/v2/ReportProblem.scala
@@ -1,6 +1,6 @@
 package org.hyperledger.identus.mercury.protocol.reportproblem.v2
 
-import io.circe.{Decoder, Encoder, *}
+import io.circe.*
 import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
 import io.circe.syntax.*
 import org.hyperledger.identus.mercury.model.{DidId, Message, PIURI}

diff --git a/...t/scala/org/hyperledger/identus/mercury/protocol/reportproblem/v2/ReportProblemSpec.scala b/...t/scala/org/hyperledger/identus/mercury/protocol/reportproblem/v2/ReportProblemSpec.scala
@@ -1,6 +1,6 @@
 package org.hyperledger.identus.mercury.protocol.reportproblem.v2
 
-import io.circe.{Json, *}
+import io.circe.*
 import io.circe.parser.*
 import io.circe.syntax.*
 import munit.*

diff --git a/.../scala/org/hyperledger/identus/pollux/core/model/error/CredentialSchemaServiceError.scala b/.../scala/org/hyperledger/identus/pollux/core/model/error/CredentialSchemaServiceError.scala
@@ -1,6 +1,5 @@
 package org.hyperledger.identus.pollux.core.model.error
 
-import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError
 import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema
 import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema.*
 import org.hyperledger.identus.shared.models.{Failure, StatusCode}

diff --git a/.../src/main/scala/org/hyperledger/identus/pollux/core/repository/CredentialRepository.scala b/.../src/main/scala/org/hyperledger/identus/pollux/core/repository/CredentialRepository.scala
@@ -4,8 +4,7 @@ import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential
 import org.hyperledger.identus.pollux.anoncreds.AnoncredCredentialRequestMetadata
 import org.hyperledger.identus.pollux.core.model.*
 import org.hyperledger.identus.pollux.core.model.IssueCredentialRecord.ProtocolState
-import org.hyperledger.identus.shared.models.KeyId
-import org.hyperledger.identus.shared.models.WalletAccessContext
+import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext}
 import zio.*
 
 trait CredentialRepository {

diff --git a/...n/scala/org/hyperledger/identus/pollux/core/repository/CredentialRepositoryInMemory.scala b/...n/scala/org/hyperledger/identus/pollux/core/repository/CredentialRepositoryInMemory.scala
@@ -4,8 +4,7 @@ import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential
 import org.hyperledger.identus.pollux.anoncreds.AnoncredCredentialRequestMetadata
 import org.hyperledger.identus.pollux.core.model.*
 import org.hyperledger.identus.pollux.core.model.IssueCredentialRecord.ProtocolState
-import org.hyperledger.identus.shared.models.{WalletAccessContext, WalletId}
-import org.hyperledger.identus.shared.models.KeyId
+import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext, WalletId}
 import zio.*
 
 import java.time.Instant

diff --git a/...scala/org/hyperledger/identus/pollux/core/repository/PresentationRepositoryInMemory.scala b/...scala/org/hyperledger/identus/pollux/core/repository/PresentationRepositoryInMemory.scala
@@ -1,29 +1,13 @@
 package org.hyperledger.identus.pollux.core.repository
 
-import cats.data.NonEmptyList
-import doobie.*
-import doobie.free.connection
-import doobie.implicits.*
-import doobie.postgres.*
-import doobie.postgres.circe.json.implicits.*
-import doobie.postgres.implicits.*
-import io.circe
-import io.circe.*
-import io.circe.parser.*
-import io.circe.syntax.*
 import org.hyperledger.identus.mercury.protocol.presentproof.*
 import org.hyperledger.identus.pollux.core.model.*
-import org.hyperledger.identus.pollux.core.model.error.PresentationError.*
 import org.hyperledger.identus.pollux.core.model.PresentationRecord.ProtocolState
-import org.hyperledger.identus.pollux.core.repository.PresentationRepository
-import org.hyperledger.identus.shared.db.ContextAwareTask
 import org.hyperledger.identus.shared.db.Implicits.*
 import org.hyperledger.identus.shared.models.{WalletAccessContext, WalletId}
 import zio.*
-import zio.interop.catz.*
 import zio.json.*
 import zio.json.ast.Json
-import zio.json.ast.Json.*
 
 import java.time.Instant
 

diff --git a/...x/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala b/...x/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala
@@ -14,8 +14,7 @@ import org.hyperledger.identus.pollux.core.model.*
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError.*
 import org.hyperledger.identus.pollux.vc.jwt.Issuer
-import org.hyperledger.identus.shared.models.KeyId
-import org.hyperledger.identus.shared.models.WalletAccessContext
+import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext}
 import zio.{Duration, IO, UIO, URIO, ZIO}
 
 import java.nio.charset.StandardCharsets

diff --git a/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala b/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala
@@ -21,11 +21,10 @@ import org.hyperledger.identus.pollux.core.model.CredentialFormat.AnonCreds
 import org.hyperledger.identus.pollux.core.model.IssueCredentialRecord.ProtocolState.OfferReceived
 import org.hyperledger.identus.pollux.core.repository.{CredentialRepository, CredentialStatusListRepository}
 import org.hyperledger.identus.pollux.sdjwt.*
-import org.hyperledger.identus.pollux.vc.jwt.{ES256KSigner, Issuer as JwtIssuer, *}
+import org.hyperledger.identus.pollux.vc.jwt.{Issuer as JwtIssuer, *}
 import org.hyperledger.identus.shared.crypto.{Ed25519KeyPair, Ed25519PublicKey, Secp256k1KeyPair}
 import org.hyperledger.identus.shared.http.{DataUrlResolver, GenericUriResolver}
-import org.hyperledger.identus.shared.models.KeyId
-import org.hyperledger.identus.shared.models.WalletAccessContext
+import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext}
 import org.hyperledger.identus.shared.utils.aspects.CustomMetricsAspect
 import zio.*
 import zio.json.*

diff --git a/...rc/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceNotifier.scala b/...rc/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceNotifier.scala
@@ -9,8 +9,7 @@ import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialReco
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError.*
 import org.hyperledger.identus.pollux.vc.jwt.Issuer
-import org.hyperledger.identus.shared.models.KeyId
-import org.hyperledger.identus.shared.models.WalletAccessContext
+import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext}
 import zio.{Duration, UIO, URIO, URLayer, ZIO, ZLayer}
 
 import java.util.UUID

diff --git a/.../main/scala/org/hyperledger/identus/pollux/core/service/CredentialStatusListService.scala b/.../main/scala/org/hyperledger/identus/pollux/core/service/CredentialStatusListService.scala
@@ -1,7 +1,6 @@
 package org.hyperledger.identus.pollux.core.service
 
 import org.hyperledger.identus.pollux.core.model.{CredentialStatusList, CredentialStatusListWithCreds, DidCommID}
-import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.pollux.core.model.error.CredentialStatusListServiceError.{
   InvalidRoleForOperation,
   StatusListNotFound,

diff --git a/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala b/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala
@@ -8,8 +8,7 @@ import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialReco
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError.*
 import org.hyperledger.identus.pollux.vc.jwt.Issuer
-import org.hyperledger.identus.shared.models.KeyId
-import org.hyperledger.identus.shared.models.WalletAccessContext
+import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext}
 import zio.{mock, Duration, IO, UIO, URIO, URLayer, ZIO, ZLayer}
 import zio.mock.{Mock, Proxy}
 

diff --git a/.../org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala b/.../org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala
@@ -3,7 +3,7 @@ package org.hyperledger.identus.pollux.core.service.verification
 import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema
 import org.hyperledger.identus.pollux.core.service.URIDereferencer
 import org.hyperledger.identus.pollux.vc.jwt.{DidResolver, JWT, JWTVerification, JwtCredential}
-import zio.{IO, *}
+import zio.*
 
 import java.time.OffsetDateTime
 

diff --git a/.../test/scala/org/hyperledger/identus/pollux/core/model/schema/AnoncredSchemaTypeSpec.scala b/.../test/scala/org/hyperledger/identus/pollux/core/model/schema/AnoncredSchemaTypeSpec.scala
@@ -6,7 +6,7 @@ import zio.*
 import zio.json.*
 import zio.json.ast.Json
 import zio.json.ast.Json.*
-import zio.test.{assertZIO, *}
+import zio.test.*
 import zio.test.Assertion.*
 
 import scala.util.Random