Merge remote-tracking branch 'origin/fix/ATL-7363' into test/backup

hyperledger · Jul 15, 2024 · 985ac26 · 985ac26
2 parents 612b68e + 3a0ad7c
commit 985ac26
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/...ent-sdk/src/commonMain/kotlin/org/hyperledger/identus/walletsdk/pluto/PlutoRestoreTask.kt b/...ent-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,

diff --git a/...k/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/pluto/BackupRestorationTests.kt b/...k/src/commonTest/kotlin/org/hyperledger/identus/walletsdk/pluto/BackupRestorationTests.kt
@@ -310,8 +310,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 +328,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 +359,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>()

diff --git a/sampleapp/src/main/java/org/hyperledger/identus/walletsdk/sampleapp/ui/main/MainActivity.kt b/sampleapp/src/main/java/org/hyperledger/identus/walletsdk/sampleapp/ui/main/MainActivity.kt