Rename all mercury packages

hyperledger · Apr 23, 2024 · bd26e63 · bd26e63
1 parent 38da3a2
commit bd26e63
Show file tree

Hide file tree

Showing 162 changed files with 1,000 additions and 458 deletions.
diff --git a/connect/lib/core/src/main/scala/io/iohk/atala/connect/core/model/ConnectionRecord.scala b/connect/lib/core/src/main/scala/io/iohk/atala/connect/core/model/ConnectionRecord.scala
@@ -1,8 +1,8 @@
 package io.iohk.atala.connect.core.model
 
 import io.iohk.atala.connect.core.model.ConnectionRecord.{ProtocolState, Role}
-import io.iohk.atala.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
-import io.iohk.atala.mercury.protocol.invitation.v2.Invitation
+import org.hyperledger.identus.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
+import org.hyperledger.identus.mercury.protocol.invitation.v2.Invitation
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit

diff --git a/.../lib/core/src/main/scala/io/iohk/atala/connect/core/repository/ConnectionRepository.scala b/.../lib/core/src/main/scala/io/iohk/atala/connect/core/repository/ConnectionRepository.scala
@@ -2,7 +2,7 @@ package io.iohk.atala.connect.core.repository
 
 import io.iohk.atala.connect.core.model.ConnectionRecord
 import io.iohk.atala.connect.core.model.ConnectionRecord.ProtocolState
-import io.iohk.atala.mercury.protocol.connection.*
+import org.hyperledger.identus.mercury.protocol.connection.*
 import io.iohk.atala.shared.models.WalletAccessContext
 import zio.UIO
 import zio.URIO

diff --git a/...e/src/main/scala/io/iohk/atala/connect/core/repository/ConnectionRepositoryInMemory.scala b/...e/src/main/scala/io/iohk/atala/connect/core/repository/ConnectionRepositoryInMemory.scala
@@ -2,8 +2,8 @@ package io.iohk.atala.connect.core.repository
 
 import io.iohk.atala.connect.core.model.ConnectionRecord
 import io.iohk.atala.connect.core.model.ConnectionRecord.ProtocolState
-import io.iohk.atala.mercury.protocol.connection.ConnectionRequest
-import io.iohk.atala.mercury.protocol.connection.ConnectionResponse
+import org.hyperledger.identus.mercury.protocol.connection.ConnectionRequest
+import org.hyperledger.identus.mercury.protocol.connection.ConnectionResponse
 import io.iohk.atala.shared.models.WalletAccessContext
 import io.iohk.atala.shared.models.WalletId
 import zio.*

diff --git a/connect/lib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionService.scala b/connect/lib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionService.scala
@@ -3,8 +3,8 @@ package io.iohk.atala.connect.core.service
 import io.iohk.atala.connect.core.model.ConnectionRecord
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError.*
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
 import io.iohk.atala.shared.models.WalletAccessContext
 import zio.*
 

diff --git a/...ct/lib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionServiceImpl.scala b/...ct/lib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionServiceImpl.scala
@@ -5,10 +5,10 @@ import io.iohk.atala.connect.core.model.ConnectionRecord.*
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError.*
 import io.iohk.atala.connect.core.repository.ConnectionRepository
-import io.iohk.atala.mercury.*
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.connection.*
-import io.iohk.atala.mercury.protocol.invitation.v2.Invitation
+import org.hyperledger.identus.*
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.connection.*
+import org.hyperledger.identus.mercury.protocol.invitation.v2.Invitation
 import io.iohk.atala.shared.models.WalletAccessContext
 import io.iohk.atala.shared.utils.Base64Utils
 import io.iohk.atala.shared.utils.aspects.CustomMetricsAspect

diff --git a/...ib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionServiceNotifier.scala b/...ib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionServiceNotifier.scala
@@ -4,8 +4,8 @@ import io.iohk.atala.connect.core.model.ConnectionRecord
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError.*
 import io.iohk.atala.event.notification.{Event, EventNotificationService}
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
 import io.iohk.atala.shared.models.WalletAccessContext
 import zio.{UIO, URIO, URLayer, ZIO, ZLayer}
 

diff --git a/...ct/lib/core/src/main/scala/io/iohk/atala/connect/core/service/MockConnectionService.scala b/...ct/lib/core/src/main/scala/io/iohk/atala/connect/core/service/MockConnectionService.scala
@@ -3,8 +3,8 @@ package io.iohk.atala.connect.core.service
 import io.iohk.atala.connect.core.model.ConnectionRecord
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError.*
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
 import io.iohk.atala.shared.models.WalletAccessContext
 import zio.mock.{Mock, Proxy}
 import zio.{UIO, URIO, URLayer, ZIO, ZLayer, mock}

diff --git a/.../src/test/scala/io/iohk/atala/connect/core/repository/ConnectionRepositorySpecSuite.scala b/.../src/test/scala/io/iohk/atala/connect/core/repository/ConnectionRepositorySpecSuite.scala
@@ -2,9 +2,9 @@ package io.iohk.atala.connect.core.repository
 
 import io.iohk.atala.connect.core.model.ConnectionRecord
 import io.iohk.atala.connect.core.model.ConnectionRecord.*
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
-import io.iohk.atala.mercury.protocol.invitation.v2.Invitation
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
+import org.hyperledger.identus.mercury.protocol.invitation.v2.Invitation
 import io.iohk.atala.shared.models.{WalletAccessContext, WalletId}
 import zio.Exit.Failure
 import zio.test.*

diff --git a/...ib/core/src/test/scala/io/iohk/atala/connect/core/service/ConnectionServiceImplSpec.scala b/...ib/core/src/test/scala/io/iohk/atala/connect/core/service/ConnectionServiceImplSpec.scala
@@ -6,8 +6,8 @@ import io.iohk.atala.connect.core.model.ConnectionRecord.*
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError
 import io.iohk.atala.connect.core.model.error.ConnectionServiceError.InvalidStateForOperation
 import io.iohk.atala.connect.core.repository.ConnectionRepositoryInMemory
-import io.iohk.atala.mercury.model.{DidId, Message}
-import io.iohk.atala.mercury.protocol.connection.ConnectionResponse
+import org.hyperledger.identus.mercury.model.{DidId, Message}
+import org.hyperledger.identus.mercury.protocol.connection.ConnectionResponse
 import io.iohk.atala.shared.models.{WalletAccessContext, WalletId}
 import zio.*
 import zio.test.*

diff --git a/...ore/src/test/scala/io/iohk/atala/connect/core/service/ConnectionServiceNotifierSpec.scala b/...ore/src/test/scala/io/iohk/atala/connect/core/service/ConnectionServiceNotifierSpec.scala
@@ -4,9 +4,9 @@ import io.iohk.atala.connect.core.model.ConnectionRecord
 import io.iohk.atala.connect.core.model.ConnectionRecord.ProtocolState
 import io.iohk.atala.connect.core.repository.ConnectionRepositoryInMemory
 import io.iohk.atala.event.notification.*
-import io.iohk.atala.mercury.model.DidId
-import io.iohk.atala.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
-import io.iohk.atala.mercury.protocol.invitation.v2.Invitation
+import org.hyperledger.identus.mercury.model.DidId
+import org.hyperledger.identus.mercury.protocol.connection.{ConnectionRequest, ConnectionResponse}
+import org.hyperledger.identus.mercury.protocol.invitation.v2.Invitation
 import io.iohk.atala.shared.models.{WalletAccessContext, WalletId}
 import zio.*
 import zio.ZIO.*

diff --git a/...doobie/src/main/scala/io/iohk/atala/connect/sql/repository/JdbcConnectionRepository.scala b/...doobie/src/main/scala/io/iohk/atala/connect/sql/repository/JdbcConnectionRepository.scala
@@ -11,8 +11,8 @@ import io.circe.syntax.*
 import io.iohk.atala.connect.core.model.*
 import io.iohk.atala.connect.core.model.ConnectionRecord.{ProtocolState, Role}
 import io.iohk.atala.connect.core.repository.ConnectionRepository
-import io.iohk.atala.mercury.protocol.connection.*
-import io.iohk.atala.mercury.protocol.invitation.v2.Invitation
+import org.hyperledger.identus.mercury.protocol.connection.*
+import org.hyperledger.identus.mercury.protocol.invitation.v2.Invitation
 import io.iohk.atala.shared.db.ContextAwareTask
 import io.iohk.atala.shared.db.Implicits.*
 import io.iohk.atala.shared.models.WalletAccessContext

diff --git a/...iohk/atala/mercury/AgentPeerService.scala → ...er/identus/mercury/AgentPeerService.scala b/...iohk/atala/mercury/AgentPeerService.scala → ...er/identus/mercury/AgentPeerService.scala
@@ -1,8 +1,8 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
 import zio._
 
-import io.iohk.atala.mercury.model.*
+import org.hyperledger.identus.mercury.model.*
 import com.nimbusds.jose.jwk.OctetKeyPair
 import org.didcommx.peerdid.core.PeerDIDUtils
 import org.didcommx.didcomm.common._

diff --git a/...cala/io/iohk/atala/mercury/DidCommX.scala → ...yperledger/identus/mercury/DidCommX.scala b/...cala/io/iohk/atala/mercury/DidCommX.scala → ...yperledger/identus/mercury/DidCommX.scala
@@ -1,12 +1,12 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
 import org.didcommx.didcomm.DIDComm
 
 import zio._
 import org.didcommx.didcomm.model._
 
-import io.iohk.atala.resolvers._
-import io.iohk.atala.mercury.model.{given, _}
+import org.hyperledger.identus.resolvers.UniversalDidResolver
+import org.hyperledger.identus.mercury.model.{given, _}
 import scala.language.implicitConversions
 
 object DidCommX {

diff --git a/...x/src/main/scala/io/iohk/atala/Main.scala → ...rg/hyperledger/identus/mercury/Main.scala b/...x/src/main/scala/io/iohk/atala/Main.scala → ...rg/hyperledger/identus/mercury/Main.scala
@@ -10,12 +10,12 @@ import java.util.Base64
 import zio._
 
 import io.iohk.atala.resolvers.{AliceSecretResolver, BobSecretResolver, MediatorSecretResolver, UniversalDidResolver}
-import io.iohk.atala.mercury.model.Message
-import io.iohk.atala.mercury.Agent
-import io.iohk.atala.mercury.AgentService
-import io.iohk.atala.mercury.protocol.routing._
-import io.iohk.atala.mercury.model.Attachment
-import io.iohk.atala.mercury.model.EncryptedMessage
+import org.hyperledger.identus.mercury.Message
+import org.hyperledger.identus.Agent
+import org.hyperledger.identus.AgentService
+import org.hyperledger.identus.mercury.protocol.routing._
+import org.hyperledger.identus.mercury.Attachment
+import org.hyperledger.identus.mercury.EncryptedMessage
 
 val program1 = for {
   messageCreated <- ZIO.succeed(makeMsg(Agent.Alice, Agent.Bob))

diff --git a/...iohk/atala/mercury/MessagingService.scala → ...er/identus/mercury/MessagingService.scala b/...iohk/atala/mercury/MessagingService.scala → ...er/identus/mercury/MessagingService.scala
@@ -1,14 +1,14 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
 import scala.jdk.CollectionConverters.*
 import zio._
 
 import io.circe._
 import io.circe.JsonObject
-import io.iohk.atala.mercury.model._
-import io.iohk.atala.mercury.model.error._
-import io.iohk.atala.mercury.protocol.routing._
-import io.iohk.atala.resolvers.DIDResolver
+import org.hyperledger.identus.mercury.model._
+import org.hyperledger.identus.mercury.error._
+import org.hyperledger.identus.mercury.protocol.routing._
+import org.hyperledger.identus.resolvers.DIDResolver
 
 type HttpOrDID = String //TODO
 case class ServiceEndpoint(uri: HttpOrDID, accept: Option[Seq[String]], routingKeys: Option[Seq[String]])
@@ -124,7 +124,7 @@ object MessagingService {
             didCommService.packEncrypted(msg = finalMessage, to = finalMessage.to.head) // TODO Head
 
         _ <- ZIO.log(s"Sending a Message to '$serviceEndpoint'")
-        resp <- HttpClient
+        resp <- org.hyperledger.identus.mercury.HttpClient
           .postDIDComm(url = serviceEndpoint, data = encryptedMessage.string)
           .catchAll { case ex => ZIO.fail(SendMessageError(ex, Some(encryptedMessage.string))) }
         _ <- ZIO.when(resp.status >= 300)(

diff --git a/...scala/io/iohk/atala/mercury/PeerDID.scala → ...hyperledger/identus/mercury/PeerDID.scala b/...scala/io/iohk/atala/mercury/PeerDID.scala → ...hyperledger/identus/mercury/PeerDID.scala
@@ -1,4 +1,4 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
 import org.didcommx.peerdid.*
 
@@ -9,7 +9,7 @@ import io.circe.syntax._
 import io.circe.generic.semiauto._
 import scala.jdk.CollectionConverters.*
 
-import io.iohk.atala.mercury.model.DidId
+import org.hyperledger.identus.mercury.model.DidId
 
 final case class PeerDID(
     did: DidId,

diff --git a/...ohk/atala/mercury/model/Conversions.scala → ...r/identus/mercury/model/Conversions.scala b/...ohk/atala/mercury/model/Conversions.scala → ...r/identus/mercury/model/Conversions.scala
@@ -1,7 +1,7 @@
-package io.iohk.atala.mercury.model
+package org.hyperledger.identus.mercury.model
 
 import io.circe.*
-import io.iohk.atala.mercury.model.*
+import org.hyperledger.identus.mercury.model.*
 import org.didcommx.didcomm.message.Attachment.Data
 import org.didcommx.didcomm.message.{MessageBuilder, Attachment as XAttachment}
 import org.didcommx.didcomm.model.*

diff --git a/.../mercury/model/JsonUtilsForDidCommx.scala → .../mercury/model/JsonUtilsForDidCommx.scala b/.../mercury/model/JsonUtilsForDidCommx.scala → .../mercury/model/JsonUtilsForDidCommx.scala
@@ -1,4 +1,4 @@
-package io.iohk.atala.mercury.model
+package org.hyperledger.identus.mercury.model
 
 import scala.jdk.CollectionConverters._
 

diff --git a/...io/iohk/atala/mercury/model/package.scala → ...edger/identus/mercury/model/package.scala b/...io/iohk/atala/mercury/model/package.scala → ...edger/identus/mercury/model/package.scala
@@ -1,4 +1,4 @@
-package io.iohk.atala.mercury.model
+package org.hyperledger.identus.mercury.model
 
 import scala.jdk.CollectionConverters.*
 

diff --git a/...atala/resolvers/AliceSecretResolver.scala → ...rcury/resolvers/AliceSecretResolver.scala b/...atala/resolvers/AliceSecretResolver.scala → ...rcury/resolvers/AliceSecretResolver.scala
@@ -1,4 +1,4 @@
-package io.iohk.atala.resolvers
+package org.hyperledger.identus.mercury.resolvers
 
 import org.didcommx.didcomm.common.{VerificationMaterial, VerificationMaterialFormat, VerificationMethodType}
 import org.didcommx.didcomm.secret.{Secret, SecretResolverInMemory}

diff --git a/...k/atala/resolvers/BobSecretResolver.scala → ...mercury/resolvers/BobSecretResolver.scala b/...k/atala/resolvers/BobSecretResolver.scala → ...mercury/resolvers/BobSecretResolver.scala
@@ -1,4 +1,4 @@
-package io.iohk.atala.resolvers
+package org.hyperledger.identus.mercury.resolvers
 
 import org.didcommx.didcomm.common.{VerificationMaterial, VerificationMaterialFormat, VerificationMethodType}
 import org.didcommx.didcomm.secret.{Secret, SecretResolverInMemory}

diff --git a/...ala/resolvers/CharlieSecretResolver.scala → ...ury/resolvers/CharlieSecretResolver.scala b/...ala/resolvers/CharlieSecretResolver.scala → ...ury/resolvers/CharlieSecretResolver.scala
@@ -9,29 +9,29 @@ import org.didcommx.peerdid._
 object CharlieSecretResolver {
 
   private val jwkKey1 =
-    // "kid":"${io.iohk.atala.mercury.charlie}#6LSiseNCbbtmG6ascxpPvoyT8ewrWdtJZxwmPNxYAPWxzM8",
+    // "kid":"${org.hyperledger.identus.charlie}#6LSiseNCbbtmG6ascxpPvoyT8ewrWdtJZxwmPNxYAPWxzM8",
     s"""{"kty":"OKP","d":"r-jK2cO3taR8LQnJB1_ikLBTAnOtShJOsHXRUWT-aZA","crv":"X25519","x":"avH0O2Y4tqLAq8y9zpianr8ajii5m4F_mICrzNlatXs"}"""
 
   private val jwkKey2 = // example from did:example:alice#key-1
-    // "kid":"${io.iohk.atala.mercury.charlie}#6MkgLBGee6xL5KH8SZmqmKmQKS2o1qd4RG4dSmjtRGTfsxX",
+    // "kid":"${org.hyperledger.identus.charlie}#6MkgLBGee6xL5KH8SZmqmKmQKS2o1qd4RG4dSmjtRGTfsxX",
     s"""{"kty":"OKP","d":"pFRUKkyzx4kHdJtFSnlPA9WzqkDT1HWV0xZ5OYZd2SY","crv":"Ed25519","x":"G-boxFB6vOZBu-wXkm-9Lh79I8nf9Z50cILaOgKKGww"}"""
 
   private val secretKey1 = new Secret(
-    io.iohk.atala.mercury.charlie + "#6LSiseNCbbtmG6ascxpPvoyT8ewrWdtJZxwmPNxYAPWxzM8",
+    org.hyperledger.identus.charlie + "#6LSiseNCbbtmG6ascxpPvoyT8ewrWdtJZxwmPNxYAPWxzM8",
     VerificationMethodType.JSON_WEB_KEY_2020,
     new VerificationMaterial(VerificationMaterialFormat.JWK, jwkKey1)
   )
   private val secretKeyAgreement1 = new Secret(
-    io.iohk.atala.mercury.charlie + "#6MkgLBGee6xL5KH8SZmqmKmQKS2o1qd4RG4dSmjtRGTfsxX",
+    org.hyperledger.identus.charlie + "#6MkgLBGee6xL5KH8SZmqmKmQKS2o1qd4RG4dSmjtRGTfsxX",
     VerificationMethodType.JSON_WEB_KEY_2020,
     new VerificationMaterial(VerificationMaterialFormat.JWK, jwkKey2)
   )
 
   val secretResolver = new SecretResolverInMemory(
     Map(
-      (io.iohk.atala.mercury.charlie + "#6LSiseNCbbtmG6ascxpPvoyT8ewrWdtJZxwmPNxYAPWxzM8") -> secretKey1,
-      (io.iohk.atala.mercury.charlie + "#6MkgLBGee6xL5KH8SZmqmKmQKS2o1qd4RG4dSmjtRGTfsxX") -> secretKeyAgreement1,
-      (io.iohk.atala.mercury.charlie) -> secretKeyAgreement1
+      (org.hyperledger.identus.charlie + "#6LSiseNCbbtmG6ascxpPvoyT8ewrWdtJZxwmPNxYAPWxzM8") -> secretKey1,
+      (org.hyperledger.identus.charlie + "#6MkgLBGee6xL5KH8SZmqmKmQKS2o1qd4RG4dSmjtRGTfsxX") -> secretKeyAgreement1,
+      (org.hyperledger.identus.charlie) -> secretKeyAgreement1
     ).asJava
   )
 
@@ -52,7 +52,7 @@ object CharlieSecretResolver {
     println(
       org.didcommx.peerdid.PeerDIDResolver
         .resolvePeerDID(
-          io.iohk.atala.mercury.charlie,
+          org.hyperledger.identus.charlie,
           VerificationMaterialFormatPeerDID.JWK
         )
     )

diff --git a/...a/io/iohk/atala/mercury/PeerDIDSpec.scala → ...rledger/identus/mercury/PeerDIDSpec.scala b/...a/io/iohk/atala/mercury/PeerDIDSpec.scala → ...rledger/identus/mercury/PeerDIDSpec.scala
@@ -1,13 +1,15 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
 import munit.*
-import io.iohk.atala.mercury.model.DidId
+import org.hyperledger.identus.mercury.model.DidId
 import com.nimbusds.jose.jwk.OctetKeyPair
+import org.hyperledger.identus.mercury.PeerDID
 
 class PeerDIDSpec extends ZSuite {
 
   test("Make and parse PeerDID") {
-    val peer = PeerDID.makePeerDid(serviceEndpoint = Some("http://localhost:8654/myendpoint"))
+    val peer =
+      org.hyperledger.identus.mercury.PeerDID.makePeerDid(serviceEndpoint = Some("http://localhost:8654/myendpoint"))
 
     val did = peer.did.value
     // Exemple {"kty":"OKP","d":"XwaryH2em2iRwqPjxInIHrhvKJqLZ_iejheA5cVM2ZY","crv":"X25519","x":"w1tZHpAuQ6TD6q5cMGWu6q2K1eL3gvEbE1gwkMzLnQI"}

diff --git a/.../mercury/model/UnpackMessageImpSpec.scala → .../mercury/model/UnpackMessageImpSpec.scala b/.../mercury/model/UnpackMessageImpSpec.scala → .../mercury/model/UnpackMessageImpSpec.scala
@@ -1,10 +1,11 @@
-package io.iohk.atala.mercury.model
+package org.hyperledger.identus.mercury.model
 
 import munit.*
 import io.circe.JsonObject
 import scala.language.implicitConversions
+import org.hyperledger.identus.mercury.model.UnpackMessageImp
 
-/** agentDidcommx/testOnly io.iohk.atala.mercury.model.UnpackMessageImpSpec */
+/** agentDidcommx/testOnly org.hyperledger.identus.mercury.UnpackMessageImpSpec */
 class UnpackMessageImpSpec extends ZSuite {
   test("Message conversions - check pleaseAck None") {
     val m1 = Message(

diff --git a/...n/scala/io/iohk/atala/mercury/Agent.scala → ...g/hyperledger/identus/mercury/Agent.scala b/...n/scala/io/iohk/atala/mercury/Agent.scala → ...g/hyperledger/identus/mercury/Agent.scala
@@ -1,6 +1,6 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
-import io.iohk.atala.mercury.model.DidId
+import org.hyperledger.identus.mercury.model.DidId
 
 enum Agent(val id: DidId):
   case Alice extends Agent(DidId("did:example:alice"))

diff --git a/...n/scala/io/iohk/atala/AgentPrograms.scala → ...edger/identus/mercury/AgentPrograms.scala b/...n/scala/io/iohk/atala/AgentPrograms.scala → ...edger/identus/mercury/AgentPrograms.scala
@@ -1,15 +1,16 @@
-package io.iohk.atala
+/*
+package org.hyperledger.identus.mercury
 
 import zio._
 
 import io.circe._
 import io.circe.Json._
 import io.circe.parser._
 import io.circe.JsonObject
-import io.iohk.atala.mercury.*
-import io.iohk.atala.mercury.model._
-import io.iohk.atala.mercury.protocol.mailbox.Mailbox.ReadMessage
-import io.iohk.atala.mercury.protocol.routing._
+import org.hyperledger.identus.*
+import org.hyperledger.identus.mercury.model._
+import org.hyperledger.identus.mercury.protocol.routing._
+import org.hyperledger.identus.mercury.{Agent, HttpClient}
 
 def makeMsg(from: Agent, to: Agent) = Message(
   `type` = "http://atalaprism.io/lets_connect/proposal",
@@ -104,3 +105,4 @@ object AgentPrograms {
   } yield ()
 
 }
+ */
diff --git a/...mercury/CoordinateMediationPrograms.scala → ...mercury/CoordinateMediationPrograms.scala b/...mercury/CoordinateMediationPrograms.scala → ...mercury/CoordinateMediationPrograms.scala
@@ -1,14 +1,14 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
 import scala.util.chaining._
 import zio._
 import io.circe.parser._
 import io.circe.JsonObject
 
-import io.iohk.atala.mercury._
-import io.iohk.atala.mercury.model._
-import io.iohk.atala.mercury.protocol.coordinatemediation._
-import io.iohk.atala.mercury.protocol.invitation.v2.Invitation
+import org.hyperledger.identus._
+import org.hyperledger.identus.mercury.model._
+import org.hyperledger.identus.mercury.protocol.coordinatemediation._
+import org.hyperledger.identus.mercury.protocol.invitation.v2.Invitation
 
 object CoordinateMediationPrograms {
 

diff --git a/...la/io/iohk/atala/mercury/HttpClient.scala → ...erledger/identus/mercury/HttpClient.scala b/...la/io/iohk/atala/mercury/HttpClient.scala → ...erledger/identus/mercury/HttpClient.scala
@@ -1,4 +1,4 @@
-package io.iohk.atala.mercury
+package org.hyperledger.identus.mercury
 
 import zio._