fix: restore process duplicates did peers

edge-agent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoRestoreTask.kt

@@ -1,5 +1,8 @@
+@file:Suppress("ktlint:standard:import-ordering")
+
 package org.hyperledger.identus.walletsdk.pluto
 
+import java.util.*
 import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
@@ -32,11 +35,12 @@ import org.hyperledger.identus.walletsdk.domain.models.keyManagement.IndexKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.JWK
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.PrivateKey
 import org.hyperledger.identus.walletsdk.domain.models.keyManagement.StorableKey
+import org.hyperledger.identus.walletsdk.pluto.PlutoRestoreTask.BackUpMessage.JsonAsStringSerializer.descriptor
+import org.hyperledger.identus.walletsdk.pluto.PlutoRestoreTask.BackUpMessage.JsonAsStringSerializer.deserialize
+import org.hyperledger.identus.walletsdk.pluto.PlutoRestoreTask.BackUpMessage.JsonAsStringSerializer.serialize
 import org.hyperledger.identus.walletsdk.pluto.backup.models.BackupV0_0_1
 import org.hyperledger.identus.walletsdk.pollux.models.AnonCredential
 import org.hyperledger.identus.walletsdk.pollux.models.JWTCredential
-import java.util.*
-import kotlin.jvm.Throws
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
@@ -57,12 +61,12 @@ open class PlutoRestoreTask(
      */
     fun run() {
         restoreCredentials()
-        restoreDids()
         restoreDidPairs()
         restoreKeys()
         restoreLinkSecret()
         restoreMessages()
         restoreMediators()
+        restoreDids()
     }
 
     /**
@@ -169,14 +173,21 @@ open class PlutoRestoreTask(
         }.forEach {
             if (it.third is DID) {
                 if (it.third.toString().contains("peer")) {
-                    val metaId = (it.third as DID).toString()
+                    val origDid = (it.third as DID)
+                    val did = if (origDid.toString().contains("#")) {
+                        val splits = origDid.toString().split("#")
+                        DID(splits[0])
+                    } else {
+                        DID(origDid.toString())
+                    }
+                    val keyId = origDid.toString()
                     pluto.storePrivateKeys(
                         it.first as StorableKey,
-                        it.third as DID,
+                        did,
                         (it.first.keySpecification[IndexKey().property])?.toInt(),
-                        metaId
+                        keyId
                     )
-                    pluto.storePeerDID(it.third as DID)
+//                    pluto.storePeerDID(did)
                 } else {
                     pluto.storePrismDIDAndPrivateKeys(
                         it.third as DID,
@@ -271,14 +282,13 @@ open class PlutoRestoreTask(
      * @throws IndexOutOfBoundsException If the input string is not in the required format `x:y:z`
      */
     @Throws(IndexOutOfBoundsException::class)
-    private fun String.toDID(alias: String? = null): DID {
-        return DID(
+    private fun String.toDID(alias: String? = null): DID =
+        DID(
             DID.getSchemaFromString(this),
             DID.getMethodFromString(this),
             DID.getMethodIdFromString(this),
             alias
         )
-    }
 
     /**
      * Represents the various types of backup restoration IDs that can be used.
@@ -295,13 +305,12 @@ open class PlutoRestoreTask(
          *
          * @return The corresponding RestorationID object based on the current BackUpRestorationId.
          */
-        fun toRestorationId(): RestorationID {
-            return when (this) {
+        fun toRestorationId(): RestorationID =
+            when (this) {
                 JWT -> RestorationID.JWT
                 ANONCRED -> RestorationID.ANONCRED
                 W3C -> RestorationID.W3C
             }
-        }
     }
 
     /**
@@ -520,8 +529,8 @@ open class PlutoRestoreTask(
          *
          * @return The converted Message object.
          */
-        fun toMessage(): Message {
-            return Message(
+        fun toMessage(): Message =
+            Message(
                 id,
                 piuri,
                 from,
@@ -537,7 +546,6 @@ open class PlutoRestoreTask(
                 ack,
                 direction
             )
-        }
 
         /**
          * Serializer for the [Message.Direction] enum class.
@@ -571,9 +579,8 @@ open class PlutoRestoreTask(
              * @param decoder The decoder used for deserialization.
              * @return The deserialized Message.Direction value.
              */
-            override fun deserialize(decoder: Decoder): Message.Direction {
-                return Message.Direction.fromValue(decoder.decodeInt())
-            }
+            override fun deserialize(decoder: Decoder): Message.Direction =
+                Message.Direction.fromValue(decoder.decodeInt())
         }
 
         /**
@@ -722,9 +729,8 @@ open class PlutoRestoreTask(
              * @param decoder The Decoder object used for deserialization.
              * @return A new instance of DID.
              */
-            override fun deserialize(decoder: Decoder): DID {
-                return DID(decoder.decodeString())
-            }
+            override fun deserialize(decoder: Decoder): DID =
+                DID(decoder.decodeString())
         }
     }
 }

edge-agent-sdk/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/pluto/BackupRestorationTests.kt

@@ -205,11 +205,10 @@ class BackupRestorationTests {
                     val revoked: Boolean
                 )
 
-                fun String.toRestorationId(): RestorationID {
-                    return RestorationID.entries.first {
+                fun String.toRestorationId(): RestorationID =
+                    RestorationID.entries.first {
                         it.value == this
                     }
-                }
 
                 val credentials = Json.decodeFromString<List<CredentialMock>>(getCredentials).map {
                     val currentCredential = when (it.restorationId.toRestorationId()) {
@@ -310,8 +309,8 @@ class BackupRestorationTests {
 
         // Validates DIDs are backed up and restored properly, and passed to pluto for storage
         val didCaptor = argumentCaptor<DID>()
-        verify(edgeAgent.pluto, times(9)).storePeerDID(didCaptor.capture())
-        assertEquals(9, didCaptor.allValues.size)
+        verify(edgeAgent.pluto, times(5)).storePeerDID(didCaptor.capture())
+        assertEquals(5, didCaptor.allValues.size)
 
         assertTrue {
             didCaptor.allValues.contains(DID("did:peer:2.Ez6LSok96TA4orHQXSMHZj3mqyUuVLMfLfGGqj27i1giErbXL.Vz6Mku5mY1GuJ9AN2vvDwjMv5QUC2zqKVRPCcbmJVYTFTCFmr"))
@@ -328,18 +327,6 @@ class BackupRestorationTests {
         assertTrue {
             didCaptor.allValues.contains(DID("did:prism:0a4b552169e3158781741fbbeffe81212784d32d90cf8f2622923f11f6ecd966:CoUBCoIBEjsKB21hc3RlcjAQAUouCglzZWNwMjU2azESIQLgzhsuOqhAyImy-c8o9ZmIJ4iY_Gc8tvNIT3l1w58f2BJDCg9hdXRoZW50aWNhdGlvbjAQBEouCglzZWNwMjU2azESIQLgzhsuOqhAyImy-c8o9ZmIJ4iY_Gc8tvNIT3l1w58f2A"))
         }
-        assertTrue {
-            didCaptor.allValues.contains(DID("did:peer:2.Ez6LSok96TA4orHQXSMHZj3mqyUuVLMfLfGGqj27i1giErbXL.Vz6Mku5mY1GuJ9AN2vvDwjMv5QUC2zqKVRPCcbmJVYTFTCFmr#key-2"))
-        }
-        assertTrue {
-            didCaptor.allValues.contains(DID("did:peer:2.Ez6LSok96TA4orHQXSMHZj3mqyUuVLMfLfGGqj27i1giErbXL.Vz6Mku5mY1GuJ9AN2vvDwjMv5QUC2zqKVRPCcbmJVYTFTCFmr#key-1"))
-        }
-        assertTrue {
-            didCaptor.allValues.contains(DID("did:peer:2.Ez6LSqWfJdwLMDmpew7Yd8AQS2MxDwvSCNpjaZ7EQVst8rkfA.Vz6MknpCj4WomXhC2eur8nf4wnoFzHpCA6EAFU6afEmmrUVRA.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6ImRpZDpwZWVyOjIuRXo2TFNnaHdTRTQzN3duREUxcHQzWDZoVkRVUXpTanNIemlucFgzWEZ2TWpSQW03eS5WejZNa2hoMWU1Q0VZWXE2SkJVY1RaNkNwMnJhbkNXUnJ2N1lheDNMZTRONTlSNmRkLlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW1oMGRIQnpPaTh2YzJsMExYQnlhWE50TFcxbFpHbGhkRzl5TG1GMFlXeGhjSEpwYzIwdWFXOGlMQ0poSWpwYkltUnBaR052YlcwdmRqSWlYWDE5LlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW5kemN6b3ZMM05wZEMxd2NtbHpiUzF0WldScFlYUnZjaTVoZEdGc1lYQnlhWE50TG1sdkwzZHpJaXdpWVNJNld5SmthV1JqYjIxdEwzWXlJbDE5ZlEiLCJyIjpbXSwiYSI6W119fQ#key-2"))
-        }
-        assertTrue {
-            didCaptor.allValues.contains(DID("did:peer:2.Ez6LSqWfJdwLMDmpew7Yd8AQS2MxDwvSCNpjaZ7EQVst8rkfA.Vz6MknpCj4WomXhC2eur8nf4wnoFzHpCA6EAFU6afEmmrUVRA.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6ImRpZDpwZWVyOjIuRXo2TFNnaHdTRTQzN3duREUxcHQzWDZoVkRVUXpTanNIemlucFgzWEZ2TWpSQW03eS5WejZNa2hoMWU1Q0VZWXE2SkJVY1RaNkNwMnJhbkNXUnJ2N1lheDNMZTRONTlSNmRkLlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW1oMGRIQnpPaTh2YzJsMExYQnlhWE50TFcxbFpHbGhkRzl5TG1GMFlXeGhjSEpwYzIwdWFXOGlMQ0poSWpwYkltUnBaR052YlcwdmRqSWlYWDE5LlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW5kemN6b3ZMM05wZEMxd2NtbHpiUzF0WldScFlYUnZjaTVoZEdGc1lYQnlhWE50TG1sdkwzZHpJaXdpWVNJNld5SmthV1JqYjIxdEwzWXlJbDE5ZlEiLCJyIjpbXSwiYSI6W119fQ#key-1"))
-        }
 
         // Validates DID pairs are backed up and restored properly, and passed to pluto for storage
         val didPairsHostCaptor = argumentCaptor<DID>()
@@ -371,7 +358,7 @@ class BackupRestorationTests {
         )
         // 9 because of already ran items and items in the key backup
         val keysDidCaptor2 = argumentCaptor<DID>()
-        verify(edgeAgent.pluto, times(9)).storePeerDID(keysDidCaptor2.capture())
+        verify(edgeAgent.pluto, times(5)).storePeerDID(keysDidCaptor2.capture())
 
         val keysCaptor = argumentCaptor<StorableKey>()
         val keysDidCaptor3 = argumentCaptor<DID>()