Merge pull request #4 from input-output-hk/refactor

Refactor
input-output-hk · Dec 14, 2022 · 62a5bd9 · 62a5bd9
2 parents 9b74acc + 02f921d
commit 62a5bd9
Show file tree

Hide file tree

Showing 31 changed files with 240 additions and 157 deletions.
diff --git a/mercury/build.gradle.kts → didcomm/build.gradle.kts b/mercury/build.gradle.kts → didcomm/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
 
 version = rootProject.version
-val currentModuleName: String = "Mercury"
+val currentModuleName: String = "DIDComm"
 val os: OperatingSystem = OperatingSystem.current()
 
 plugins {

diff --git a/mercury/mercury.podspec → didcomm/didcomm.podspec b/mercury/mercury.podspec → didcomm/didcomm.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
-    spec.name                     = 'mercury'
+    spec.name                     = 'didcomm'
     spec.version                  = '1.0.0-alpha'
     spec.homepage                 = ''
     spec.source                   = { :http=> ''}
     spec.authors                  = 'IOG'
     spec.license                  = ''
     spec.summary                  = 'Mercury around Atala PRISM'
-    spec.vendored_frameworks      = 'build/cocoapods/framework/Mercury.framework'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/DIDComm.framework'
     spec.libraries                = 'c++'
     spec.ios.deployment_target = '13.0'
     spec.osx.deployment_target = '12.0'
@@ -15,13 +15,13 @@ Pod::Spec.new do |spec|
 
 
     spec.pod_target_xcconfig = {
-        'KOTLIN_PROJECT_PATH' => ':mercury',
-        'PRODUCT_MODULE_NAME' => 'Mercury',
+        'KOTLIN_PROJECT_PATH' => ':didcomm',
+        'PRODUCT_MODULE_NAME' => 'DIDComm',
     }
 
     spec.script_phases = [
         {
-            :name => 'Build mercury',
+            :name => 'Build didcomm',
             :execution_position => :before_compile,
             :shell_path => '/bin/sh',
             :script => <<-SCRIPT

diff --git a/didcomm/src/androidMain/AndroidManifest.xml b/didcomm/src/androidMain/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="io.iohk.atala.prism.didcomm" />
diff --git a/didpeer/build.gradle.kts b/didpeer/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
 
 version = rootProject.version
-val currentModuleName: String = "MercuryDIDPeer"
+val currentModuleName: String = "DIDCommDIDPeer"
 val os: OperatingSystem = OperatingSystem.current()
 
 plugins {

diff --git a/didpeer/didpeer.podspec b/didpeer/didpeer.podspec
@@ -6,7 +6,7 @@ Pod::Spec.new do |spec|
     spec.authors                  = 'IOG'
     spec.license                  = ''
     spec.summary                  = 'Mercury DIDPeer Atala PRISM'
-    spec.vendored_frameworks      = 'build/cocoapods/framework/MercuryDIDPeer.framework'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/DIDCommDIDPeer.framework'
     spec.libraries                = 'c++'
     spec.ios.deployment_target = '13.0'
     spec.osx.deployment_target = '12.0'
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
 
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':didpeer',
-        'PRODUCT_MODULE_NAME' => 'MercuryDIDPeer',
+        'PRODUCT_MODULE_NAME' => 'DIDCommDIDPeer',
     }
 
     spec.script_phases = [

diff --git a/didpeer/src/androidMain/AndroidManifest.xml b/didpeer/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.iohk.atala.prism.mercury.didpeer" />
+<manifest package="io.iohk.atala.prism.didcomm.didpeer" />
diff --git a/...ohk.atala.prism.mercury.didpeer/DIDDoc.kt → ...ohk.atala.prism.didcomm.didpeer/DIDDoc.kt b/...ohk.atala.prism.mercury.didpeer/DIDDoc.kt → ...ohk.atala.prism.didcomm.didpeer/DIDDoc.kt
@@ -1,7 +1,7 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
-import io.iohk.atala.prism.mercury.didpeer.core.didDocFromJson
-import io.iohk.atala.prism.mercury.didpeer.core.toJsonElement
+import io.iohk.atala.prism.didcomm.didpeer.core.didDocFromJson
+import io.iohk.atala.prism.didcomm.didpeer.core.toJsonElement
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject

diff --git a/...atala.prism.mercury.didpeer/Exceptions.kt → ...atala.prism.didcomm.didpeer/Exceptions.kt b/...atala.prism.mercury.didpeer/Exceptions.kt → ...atala.prism.didcomm.didpeer/Exceptions.kt
@@ -1,4 +1,4 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
 /**
  * The base class for all PeerDID errors and exceptions.

diff --git a/...a.prism.mercury.didpeer/PeerDIDCreator.kt → ...a.prism.didcomm.didpeer/PeerDIDCreator.kt b/...a.prism.mercury.didpeer/PeerDIDCreator.kt → ...a.prism.didcomm.didpeer/PeerDIDCreator.kt
@@ -1,11 +1,11 @@
 @file:JvmName("PeerDIDCreator")
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
-import io.iohk.atala.prism.mercury.didpeer.core.Numalgo2Prefix
-import io.iohk.atala.prism.mercury.didpeer.core.createMultibaseEncnumbasis
-import io.iohk.atala.prism.mercury.didpeer.core.encodeService
-import io.iohk.atala.prism.mercury.didpeer.core.validateAgreementMaterialType
-import io.iohk.atala.prism.mercury.didpeer.core.validateAuthenticationMaterialType
+import io.iohk.atala.prism.didcomm.didpeer.core.Numalgo2Prefix
+import io.iohk.atala.prism.didcomm.didpeer.core.createMultibaseEncnumbasis
+import io.iohk.atala.prism.didcomm.didpeer.core.encodeService
+import io.iohk.atala.prism.didcomm.didpeer.core.validateAgreementMaterialType
+import io.iohk.atala.prism.didcomm.didpeer.core.validateAuthenticationMaterialType
 import kotlin.jvm.JvmName
 
 /**

diff --git a/....prism.mercury.didpeer/PeerDIDResolver.kt → ....prism.didcomm.didpeer/PeerDIDResolver.kt b/....prism.mercury.didpeer/PeerDIDResolver.kt → ....prism.didcomm.didpeer/PeerDIDResolver.kt
@@ -1,13 +1,13 @@
 @file:JvmName("PeerDIDResolver")
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
-import io.iohk.atala.prism.mercury.didpeer.core.DecodedEncumbasis
-import io.iohk.atala.prism.mercury.didpeer.core.Numalgo2Prefix
-import io.iohk.atala.prism.mercury.didpeer.core.decodeMultibaseEncnumbasis
-import io.iohk.atala.prism.mercury.didpeer.core.decodeService
-import io.iohk.atala.prism.mercury.didpeer.core.getVerificationMethod
-import io.iohk.atala.prism.mercury.didpeer.core.validateAgreementMaterialType
-import io.iohk.atala.prism.mercury.didpeer.core.validateAuthenticationMaterialType
+import io.iohk.atala.prism.didcomm.didpeer.core.DecodedEncumbasis
+import io.iohk.atala.prism.didcomm.didpeer.core.Numalgo2Prefix
+import io.iohk.atala.prism.didcomm.didpeer.core.decodeMultibaseEncnumbasis
+import io.iohk.atala.prism.didcomm.didpeer.core.decodeService
+import io.iohk.atala.prism.didcomm.didpeer.core.getVerificationMethod
+import io.iohk.atala.prism.didcomm.didpeer.core.validateAgreementMaterialType
+import io.iohk.atala.prism.didcomm.didpeer.core.validateAuthenticationMaterialType
 import kotlin.jvm.JvmName
 
 /** Resolves [DIDDocPeerDID] from [PeerDID]

diff --git a/...iohk.atala.prism.mercury.didpeer/Types.kt → ...iohk.atala.prism.didcomm.didpeer/Types.kt b/...iohk.atala.prism.mercury.didpeer/Types.kt → ...iohk.atala.prism.didcomm.didpeer/Types.kt
@@ -1,4 +1,4 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable

diff --git a/...rism.mercury.didpeer/core/DIDDocHelper.kt → ...rism.didcomm.didpeer/core/DIDDocHelper.kt b/...rism.mercury.didpeer/core/DIDDocHelper.kt → ...rism.didcomm.didpeer/core/DIDDocHelper.kt
@@ -1,22 +1,22 @@
-package io.iohk.atala.prism.mercury.didpeer.core
-
-import io.iohk.atala.prism.mercury.didpeer.DIDCommServicePeerDID
-import io.iohk.atala.prism.mercury.didpeer.DIDDocPeerDID
-import io.iohk.atala.prism.mercury.didpeer.OtherService
-import io.iohk.atala.prism.mercury.didpeer.PublicKeyField
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_ACCEPT
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_DIDCOMM_MESSAGING
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_ENDPOINT
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_ID
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_ROUTING_KEYS
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_TYPE
-import io.iohk.atala.prism.mercury.didpeer.Service
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialFormatPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAgreement
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAuthentication
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypePeerDID
+package io.iohk.atala.prism.didcomm.didpeer.core
+
+import io.iohk.atala.prism.didcomm.didpeer.DIDCommServicePeerDID
+import io.iohk.atala.prism.didcomm.didpeer.DIDDocPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.OtherService
+import io.iohk.atala.prism.didcomm.didpeer.PublicKeyField
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_ACCEPT
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_DIDCOMM_MESSAGING
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_ENDPOINT
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_ID
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_ROUTING_KEYS
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_TYPE
+import io.iohk.atala.prism.didcomm.didpeer.Service
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialFormatPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAgreement
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAuthentication
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypePeerDID
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.contentOrNull

diff --git a/...ala.prism.mercury.didpeer/core/JWK_OKP.kt → ...ala.prism.didcomm.didpeer/core/JWK_OKP.kt b/...ala.prism.mercury.didpeer/core/JWK_OKP.kt → ...ala.prism.didcomm.didpeer/core/JWK_OKP.kt
@@ -1,11 +1,11 @@
-package io.iohk.atala.prism.mercury.didpeer.core
+package io.iohk.atala.prism.didcomm.didpeer.core
 
 import io.iohk.atala.prism.apollo.base64.base64UrlEncoded
 import io.iohk.atala.prism.apollo.base64.base64UrlPadDecodedBytes
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAgreement
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAuthentication
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypePeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAgreement
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAuthentication
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypePeerDID
 
 fun toJwk(publicKey: ByteArray, verMethodType: VerificationMethodTypePeerDID): Map<String, String> {
     val x = publicKey.base64UrlEncoded

diff --git a/...a.prism.mercury.didpeer/core/Multibase.kt → ...a.prism.didcomm.didpeer/core/Multibase.kt b/...a.prism.mercury.didpeer/core/Multibase.kt → ...a.prism.didcomm.didpeer/core/Multibase.kt
@@ -1,4 +1,4 @@
-package io.iohk.atala.prism.mercury.didpeer.core
+package io.iohk.atala.prism.didcomm.didpeer.core
 
 import io.iohk.atala.prism.apollo.base58.base58BtcDecodedBytes
 import io.iohk.atala.prism.apollo.base58.base58BtcEncoded

diff --git a/....prism.mercury.didpeer/core/Multicodec.kt → ....prism.didcomm.didpeer/core/Multicodec.kt b/....prism.mercury.didpeer/core/Multicodec.kt → ....prism.didcomm.didpeer/core/Multicodec.kt
@@ -1,8 +1,8 @@
-package io.iohk.atala.prism.mercury.didpeer.core
+package io.iohk.atala.prism.didcomm.didpeer.core
 
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAgreement
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAuthentication
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypePeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAgreement
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAuthentication
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypePeerDID
 import okio.Buffer
 
 enum class Codec(val prefix: Int) {

diff --git a/...ism.mercury.didpeer/core/PeerDIDHelper.kt → ...ism.didcomm.didpeer/core/PeerDIDHelper.kt b/...ism.mercury.didpeer/core/PeerDIDHelper.kt → ...ism.didcomm.didpeer/core/PeerDIDHelper.kt
@@ -1,25 +1,25 @@
 @file:JvmName("PeerDIDUtils")
-package io.iohk.atala.prism.mercury.didpeer.core
+package io.iohk.atala.prism.didcomm.didpeer.core
 
 import io.iohk.atala.prism.apollo.base64.base64UrlDecoded
 import io.iohk.atala.prism.apollo.base64.base64UrlEncoded
-import io.iohk.atala.prism.mercury.didpeer.JSON
-import io.iohk.atala.prism.mercury.didpeer.OtherService
-import io.iohk.atala.prism.mercury.didpeer.PeerDID
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_ACCEPT
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_DIDCOMM_MESSAGING
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_ENDPOINT
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_ROUTING_KEYS
-import io.iohk.atala.prism.mercury.didpeer.SERVICE_TYPE
-import io.iohk.atala.prism.mercury.didpeer.Service
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialAgreement
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialAuthentication
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialFormatPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAgreement
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAuthentication
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypePeerDID
+import io.iohk.atala.prism.didcomm.didpeer.JSON
+import io.iohk.atala.prism.didcomm.didpeer.OtherService
+import io.iohk.atala.prism.didcomm.didpeer.PeerDID
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_ACCEPT
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_DIDCOMM_MESSAGING
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_ENDPOINT
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_ROUTING_KEYS
+import io.iohk.atala.prism.didcomm.didpeer.SERVICE_TYPE
+import io.iohk.atala.prism.didcomm.didpeer.Service
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialAgreement
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialAuthentication
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialFormatPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAgreement
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAuthentication
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypePeerDID
 import kotlinx.serialization.SerializationException
 import kotlin.jvm.JvmName
 

diff --git a/...atala.prism.mercury.didpeer/core/Utils.kt → ...atala.prism.didcomm.didpeer/core/Utils.kt b/...atala.prism.mercury.didpeer/core/Utils.kt → ...atala.prism.didcomm.didpeer/core/Utils.kt
@@ -1,4 +1,4 @@
-package io.iohk.atala.prism.mercury.didpeer.core
+package io.iohk.atala.prism.didcomm.didpeer.core
 
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json

diff --git a/....prism.mercury.didpeer/core/Validation.kt → ....prism.didcomm.didpeer/core/Validation.kt b/....prism.mercury.didpeer/core/Validation.kt → ....prism.didcomm.didpeer/core/Validation.kt
@@ -1,9 +1,9 @@
-package io.iohk.atala.prism.mercury.didpeer.core
+package io.iohk.atala.prism.didcomm.didpeer.core
 
-import io.iohk.atala.prism.mercury.didpeer.VerificationMaterialPeerDID
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAgreement
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypeAuthentication
-import io.iohk.atala.prism.mercury.didpeer.VerificationMethodTypePeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialPeerDID
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAgreement
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAuthentication
+import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypePeerDID
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 

diff --git a/...tala.prism.mercury.didpeer/core/VarInt.kt → ...tala.prism.didcomm.didpeer/core/VarInt.kt b/...tala.prism.mercury.didpeer/core/VarInt.kt → ...tala.prism.didcomm.didpeer/core/VarInt.kt
@@ -1,7 +1,9 @@
-package io.iohk.atala.prism.mercury.didpeer.core
+package io.iohk.atala.prism.didcomm.didpeer.core
 
 import okio.Buffer
 
+// TODO: Move this implementation to its own Module and update it to follow these specifications
+//  https://github.com/multiformats/unsigned-varint
 object VarInt {
     fun writeVarInt(value: Int, byteBuffer: Buffer) {
         var value = value

diff --git a/...hk.atala.prism.mercury.didpeer/Fixture.kt → ...hk.atala.prism.didcomm.didpeer/Fixture.kt b/...hk.atala.prism.mercury.didpeer/Fixture.kt → ...hk.atala.prism.didcomm.didpeer/Fixture.kt
@@ -1,4 +1,4 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject

diff --git a/...ism.mercury.didpeer/TestCreateNumalgo0.kt → ...ism.didcomm.didpeer/TestCreateNumalgo0.kt b/...ism.mercury.didpeer/TestCreateNumalgo0.kt → ...ism.didcomm.didpeer/TestCreateNumalgo0.kt
@@ -1,6 +1,6 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
-import io.iohk.atala.prism.mercury.didpeer.core.toJson
+import io.iohk.atala.prism.didcomm.didpeer.core.toJson
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...ism.mercury.didpeer/TestCreateNumalgo2.kt → ...ism.didcomm.didpeer/TestCreateNumalgo2.kt b/...ism.mercury.didpeer/TestCreateNumalgo2.kt → ...ism.didcomm.didpeer/TestCreateNumalgo2.kt
@@ -1,6 +1,6 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
-import io.iohk.atala.prism.mercury.didpeer.core.toJson
+import io.iohk.atala.prism.didcomm.didpeer.core.toJson
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -141,9 +141,9 @@ class TestCreateNumalgo2 {
             )
             assertEquals(
                 "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc" +
-                        ".Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V" +
-                        ".Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg" +
-                        ".SW3sidCI6ImRtIiwicyI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQiLCJyIjpbImRpZDpleGFtcGxlOnNvbWVtZWRpYXRvciNzb21la2V5Il19LHsidCI6ImV4YW1wbGUiLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludDIiLCJyIjpbImRpZDpleGFtcGxlOnNvbWVtZWRpYXRvciNzb21la2V5MiJdLCJhIjpbImRpZGNvbW0vdjIiLCJkaWRjb21tL2FpcDI7ZW52PXJmYzU4NyJdfV0",
+                    ".Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V" +
+                    ".Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg" +
+                    ".SW3sidCI6ImRtIiwicyI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQiLCJyIjpbImRpZDpleGFtcGxlOnNvbWVtZWRpYXRvciNzb21la2V5Il19LHsidCI6ImV4YW1wbGUiLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludDIiLCJyIjpbImRpZDpleGFtcGxlOnNvbWVtZWRpYXRvciNzb21la2V5MiJdLCJhIjpbImRpZGNvbW0vdjIiLCJkaWRjb21tL2FpcDI7ZW52PXJmYzU4NyJdfV0",
                 peerDIDAlgo2
             )
             assertTrue(isPeerDID(peerDIDAlgo2))
@@ -229,8 +229,8 @@ class TestCreateNumalgo2 {
 
         assertEquals(
             "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc" +
-                    ".Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V" +
-                    ".Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg",
+                ".Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V" +
+                ".Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg",
             peerDIDAlgo2
         )
         assertTrue(isPeerDID(peerDIDAlgo2))
@@ -249,9 +249,9 @@ class TestCreateNumalgo2 {
         )
         assertEquals(
             "did:peer:2" +
-                    ".Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V" +
-                    ".Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg" +
-                    ".SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
+                ".Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V" +
+                ".Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg" +
+                ".SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
             peerDIDAlgo2
         )
         assertTrue(isPeerDID(peerDIDAlgo2))
@@ -269,7 +269,7 @@ class TestCreateNumalgo2 {
         )
         assertEquals(
             "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc" +
-                    ".SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
+                ".SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
             peerDIDAlgo2
         )
         assertTrue(isPeerDID(peerDIDAlgo2))

diff --git a/...ism.mercury.didpeer/TestDIDDocFromJson.kt → ...ism.didcomm.didpeer/TestDIDDocFromJson.kt b/...ism.mercury.didpeer/TestDIDDocFromJson.kt → ...ism.didcomm.didpeer/TestDIDDocFromJson.kt
@@ -1,4 +1,4 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement

diff --git a/...k.atala.prism.mercury.didpeer/TestDemo.kt → ...k.atala.prism.didcomm.didpeer/TestDemo.kt b/...k.atala.prism.mercury.didpeer/TestDemo.kt → ...k.atala.prism.didcomm.didpeer/TestDemo.kt
@@ -1,6 +1,6 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
-import io.iohk.atala.prism.mercury.didpeer.core.VarInt
+import io.iohk.atala.prism.didcomm.didpeer.core.VarInt
 import okio.Buffer
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...sm.mercury.didpeer/TestResolveNumalgo0.kt → ...sm.didcomm.didpeer/TestResolveNumalgo0.kt b/...sm.mercury.didpeer/TestResolveNumalgo0.kt → ...sm.didcomm.didpeer/TestResolveNumalgo0.kt
@@ -1,4 +1,4 @@
-package io.iohk.atala.prism.mercury.didpeer
+package io.iohk.atala.prism.didcomm.didpeer
 
 import kotlin.test.Test
 import kotlin.test.assertEquals