chore: resolve rename conflicts

hyperledger · Apr 29, 2024 · 51fd6a8 · 51fd6a8
1 parent 3d5b0bb
commit 51fd6a8
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 56 deletions.
diff --git a/.../src/main/scala/org/hyperledger/identus/agent/walletapi/storage/DIDNonSecretStorage.scala b/.../src/main/scala/org/hyperledger/identus/agent/walletapi/storage/DIDNonSecretStorage.scala
@@ -4,10 +4,10 @@ import org.hyperledger.identus.agent.walletapi.model.*
 import org.hyperledger.identus.castor.core.model.did.{PrismDID, ScheduledDIDOperationStatus}
 import org.hyperledger.identus.mercury.model.DidId
 import org.hyperledger.identus.shared.models.WalletAccessContext
-import io.iohk.atala.agent.walletapi.model.*
-import io.iohk.atala.castor.core.model.did.{PrismDID, ScheduledDIDOperationStatus}
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.shared.models.{WalletAccessContext, WalletId}
+import org.hyperledger.identus.agent.walletapi.model.*
+import org.hyperledger.identus.castor.core.model.did.{PrismDID, ScheduledDIDOperationStatus}
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.shared.models.{WalletAccessContext, WalletId}
 import zio.*
 
 import scala.collection.immutable.ArraySeq

diff --git a/.../main/scala/org/hyperledger/identus/agent/walletapi/storage/MockDIDNonSecretStorage.scala b/.../main/scala/org/hyperledger/identus/agent/walletapi/storage/MockDIDNonSecretStorage.scala
@@ -1,9 +1,9 @@
-package io.iohk.atala.agent.walletapi.storage
+package org.hyperledger.identus.agent.walletapi.storage
 
-import io.iohk.atala.agent.walletapi.model.*
-import io.iohk.atala.castor.core.model.did.{PrismDID, ScheduledDIDOperationStatus}
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.shared.models.{WalletAccessContext, WalletId}
+import org.hyperledger.identus.agent.walletapi.model.*
+import org.hyperledger.identus.castor.core.model.did.{PrismDID, ScheduledDIDOperationStatus}
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.shared.models.{WalletAccessContext, WalletId}
 import zio.mock.{Expectation, Mock, Proxy}
 import zio.test.Assertion.equalTo
 import zio.*
@@ -39,8 +39,9 @@ case class MockDIDNonSecretStorage(proxy: Proxy) extends DIDNonSecretStorage {
   override def insertManagedDID(
       did: PrismDID,
       state: ManagedDIDState,
-      hdKey: Map[String, ManagedDIDHdKeyPath]
-  ): RIO[WalletAccessContext, Unit] = proxy(MockDIDNonSecretStorage.InsertManagedDID, (did, state, hdKey))
+      hdKey: Map[String, ManagedDIDHdKeyPath],
+      randKey: Map[String, ManagedDIDRandKeyMeta]
+  ): RIO[WalletAccessContext, Unit] = proxy(MockDIDNonSecretStorage.InsertManagedDID, (did, state, hdKey, randKey))
 
   override def updateManagedDID(did: PrismDID, patch: ManagedDIDStatePatch): RIO[WalletAccessContext, Unit] =
     proxy(MockDIDNonSecretStorage.UpdateManagedDID, (did, patch))
@@ -51,16 +52,19 @@ case class MockDIDNonSecretStorage(proxy: Proxy) extends DIDNonSecretStorage {
   override def getHdKeyCounter(did: PrismDID): RIO[WalletAccessContext, Option[HdKeyIndexCounter]] =
     proxy(MockDIDNonSecretStorage.GetHdKeyCounter, did)
 
-  override def getHdKeyPath(did: PrismDID, keyId: String): RIO[WalletAccessContext, Option[ManagedDIDHdKeyPath]] =
-    proxy(MockDIDNonSecretStorage.GetHdKeyPath, (did, keyId))
+  override def getKeyMeta(
+      did: PrismDID,
+      keyId: String
+  ): RIO[WalletAccessContext, Option[(ManagedDIDKeyMeta, Array[Byte])]] =
+    proxy(MockDIDNonSecretStorage.GetKeyMeta, (did, keyId))
 
-  override def insertHdKeyPath(
+  override def insertKeyMeta(
       did: PrismDID,
       keyId: String,
-      hdKeyPath: ManagedDIDHdKeyPath,
+      meta: ManagedDIDKeyMeta,
       operationHash: Array[Byte]
   ): RIO[WalletAccessContext, Unit] =
-    proxy(MockDIDNonSecretStorage.InsertHdKeyPath, (did, keyId, hdKeyPath, operationHash))
+    proxy(MockDIDNonSecretStorage.InsertHdKeyMeta, (did, keyId, meta, operationHash))
 
   override def listHdKeyPath(
       did: PrismDID
@@ -82,12 +86,17 @@ object MockDIDNonSecretStorage extends Mock[DIDNonSecretStorage] {
   object GetPeerDIDRecord extends Effect[DidId, Throwable, Option[PeerDIDRecord]]
   object GetPrismDidWalletId extends Effect[PrismDID, Throwable, Option[WalletId]]
   object GetManagedDIDState extends Effect[PrismDID, Throwable, Option[ManagedDIDState]]
-  object InsertManagedDID extends Effect[(PrismDID, ManagedDIDState, Map[String, ManagedDIDHdKeyPath]), Throwable, Unit]
+  object InsertManagedDID
+      extends Effect[
+        (PrismDID, ManagedDIDState, Map[String, ManagedDIDHdKeyPath], Map[String, ManagedDIDRandKeyMeta]),
+        Throwable,
+        Unit
+      ]
   object UpdateManagedDID extends Effect[(PrismDID, ManagedDIDStatePatch), Throwable, Unit]
   object GetMaxDIDIndex extends Effect[Unit, Throwable, Option[Int]]
   object GetHdKeyCounter extends Effect[PrismDID, Throwable, Option[HdKeyIndexCounter]]
-  object GetHdKeyPath extends Effect[(PrismDID, String), Throwable, Option[ManagedDIDHdKeyPath]]
-  object InsertHdKeyPath extends Effect[(PrismDID, String, ManagedDIDHdKeyPath, Array[Byte]), Throwable, Unit]
+  object GetKeyMeta extends Effect[(PrismDID, String), Throwable, Option[(ManagedDIDKeyMeta, Array[Byte])]]
+  object InsertHdKeyMeta extends Effect[(PrismDID, String, ManagedDIDKeyMeta, Array[Byte]), Throwable, Unit]
   object ListHdKeyPath extends Effect[PrismDID, Throwable, Seq[(String, ArraySeq[Byte], ManagedDIDHdKeyPath)]]
   object ListManagedDID extends Effect[(Option[Int], Option[Int]), Throwable, (Seq[(PrismDID, ManagedDIDState)], Int)]
 

diff --git a/...del/oidc4vc/CredentialConfiguration.scala → ...del/oidc4vc/CredentialConfiguration.scala b/...del/oidc4vc/CredentialConfiguration.scala → ...del/oidc4vc/CredentialConfiguration.scala
@@ -1,6 +1,6 @@
-package io.iohk.atala.pollux.core.model.oidc4vc
+package org.hyperledger.identus.pollux.core.model.oidc4vc
 
-import io.iohk.atala.pollux.core.model.CredentialFormat
+import org.hyperledger.identus.pollux.core.model.CredentialFormat
 import zio.json.ast.Json
 
 import java.net.URI

diff --git a/...core/model/oidc4vc/CredentialIssuer.scala → ...core/model/oidc4vc/CredentialIssuer.scala b/...core/model/oidc4vc/CredentialIssuer.scala → ...core/model/oidc4vc/CredentialIssuer.scala
@@ -1,4 +1,4 @@
-package io.iohk.atala.pollux.core.model.oidc4vc
+package org.hyperledger.identus.pollux.core.model.oidc4vc
 
 import java.net.URL
 import java.time.Instant

diff --git a/...cala/org/hyperledger/identus/pollux/core/repository/OIDC4VCIssuerMetadataRepository.scala b/...cala/org/hyperledger/identus/pollux/core/repository/OIDC4VCIssuerMetadataRepository.scala
@@ -1,8 +1,8 @@
 package io.iohk.atala.pollux.core.repository
 
-import io.iohk.atala.pollux.core.model.oidc4vc.CredentialConfiguration
-import io.iohk.atala.pollux.core.model.oidc4vc.CredentialIssuer
-import io.iohk.atala.shared.models.WalletAccessContext
+import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration
+import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialIssuer
+import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.*
 
 import java.util.UUID

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,14 +14,14 @@ 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.shared.models.WalletAccessContext
-import io.iohk.atala.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.issuecredential.{Attribute, IssueCredential, OfferCredential, RequestCredential}
-import io.iohk.atala.pollux.core.model.*
-import io.iohk.atala.pollux.core.model.error.CredentialServiceError
-import io.iohk.atala.pollux.core.model.error.CredentialServiceError.*
-import io.iohk.atala.pollux.vc.jwt.Issuer
-import io.iohk.atala.shared.models.WalletAccessContext
+import org.hyperledger.identus.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.issuecredential.{Attribute, IssueCredential, OfferCredential, RequestCredential}
+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.WalletAccessContext
 import zio.{IO, ZIO}
 
 import java.nio.charset.StandardCharsets

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,14 +9,14 @@ import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialRecord}
 import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.{URLayer, ZIO, ZLayer, IO}
-import io.iohk.atala.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
-import io.iohk.atala.event.notification.*
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.issuecredential.{IssueCredential, OfferCredential, RequestCredential}
-import io.iohk.atala.pollux.core.model.error.CredentialServiceError
-import io.iohk.atala.pollux.core.model.{DidCommID, IssueCredentialRecord}
-import io.iohk.atala.pollux.vc.jwt.Issuer
-import io.iohk.atala.shared.models.WalletAccessContext
+import org.hyperledger.identus.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
+import org.hyperledger.identus.event.notification.*
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential, OfferCredential, RequestCredential}
+import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
+import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialRecord}
+import org.hyperledger.identus.pollux.vc.jwt.Issuer
+import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.{IO, URLayer, ZIO, ZLayer}
 
 import java.util.UUID

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
@@ -7,13 +7,13 @@ import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialRecord}
 import org.hyperledger.identus.shared.models.WalletAccessContext
-import io.iohk.atala.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.issuecredential.{IssueCredential, OfferCredential, RequestCredential}
-import io.iohk.atala.pollux.core.model.error.CredentialServiceError
-import io.iohk.atala.pollux.core.model.{DidCommID, IssueCredentialRecord}
-import io.iohk.atala.pollux.vc.jwt.Issuer
-import io.iohk.atala.shared.models.WalletAccessContext
+import org.hyperledger.identus.castor.core.model.did.{CanonicalPrismDID, PrismDID, VerificationRelationship}
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.issuecredential.{IssueCredential, OfferCredential, RequestCredential}
+import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
+import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialRecord}
+import org.hyperledger.identus.pollux.vc.jwt.Issuer
+import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.mock.{Mock, Proxy}
 import zio.{IO, URLayer, ZIO, ZLayer, mock}
 

diff --git a/...main/scala/org/hyperledger/identus/pollux/core/service/OIDC4VCIssuerMetadataService.scala b/...main/scala/org/hyperledger/identus/pollux/core/service/OIDC4VCIssuerMetadataService.scala
@@ -1,17 +1,18 @@
 package io.iohk.atala.pollux.core.service
 
-import io.iohk.atala.pollux.core.model.CredentialFormat
-import io.iohk.atala.pollux.core.model.error.CredentialSchemaError.URISyntaxError
-import io.iohk.atala.pollux.core.model.oidc4vc.CredentialConfiguration
-import io.iohk.atala.pollux.core.model.oidc4vc.CredentialIssuer
-import io.iohk.atala.pollux.core.model.schema.CredentialSchema
+import org.hyperledger.identus.pollux.core.model.CredentialFormat
+import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError.URISyntaxError
+import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration
+import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialIssuer
+import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema
+import org.hyperledger.identus.pollux.core.service.URIDereferencer
 import io.iohk.atala.pollux.core.repository.OIDC4VCIssuerMetadataRepository
 import io.iohk.atala.pollux.core.service.OIDC4VCIssuerMetadataServiceError.InvalidSchemaId
 import io.iohk.atala.pollux.core.service.OIDC4VCIssuerMetadataServiceError.IssuerIdNotFound
 import io.iohk.atala.pollux.core.service.OIDC4VCIssuerMetadataServiceError.UnsupportedCredentialFormat
-import io.iohk.atala.shared.models.Failure
-import io.iohk.atala.shared.models.StatusCode
-import io.iohk.atala.shared.models.WalletAccessContext
+import org.hyperledger.identus.shared.models.Failure
+import org.hyperledger.identus.shared.models.StatusCode
+import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.*
 
 import java.net.URI