test(prism-agent): add wallet-api and key-management tests (#362)

* WIP: add test containers * WIP: make test container migration work * WIP: add sample for JdbcDIDSecretStorage * test(prism-agent): add DIDSecretStorage getKey tests * test(prism-agent): add DIDSecretStorage insertKey tests * test(prism-agent): add removeKey tests * test(prism-agent): add removeDIDSecret tests * fix(prism-agent): remove InMemoryStorage implementation * test(prism-agent): add ManagedDIDState crud tests * test(prism-agent): add DIDLineage crud tests * build(prism-agent): use scala 3.2.2 * Revert "build(prism-agent): use scala 3.2.2" This reverts commit 6b7c183. * test(prism-agent): improve coverage on createAndStoreDID and publishStoredDID * test(prism-agent): add updateManagedDID tests * test(prism-agent): add deactivateManagedDID tests * test(prism-agent): add DID update lineage assertion * chore: docuemnt some logger config
hyperledger · Feb 9, 2023 · 74e1d21 · 74e1d21
1 parent e1e5f42
commit 74e1d21
Show file tree

Hide file tree

Showing 15 changed files with 916 additions and 323 deletions.
diff --git a/prism-agent/service/project/Dependencies.scala b/prism-agent/service/project/Dependencies.scala
@@ -120,7 +120,8 @@ object Dependencies {
     baseDependencies ++
       castorDependencies ++
       mercuryDependencies ++
-      bouncyDependencies
+      bouncyDependencies ++
+      postgresDependencies
 
   lazy val serverDependencies: Seq[ModuleID] =
     baseDependencies ++

diff --git a/...e/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/service/ManagedDIDService.scala b/...e/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/service/ManagedDIDService.scala
@@ -13,12 +13,7 @@ import io.iohk.atala.agent.walletapi.model.{
 import io.iohk.atala.agent.walletapi.model.ECCoordinates.*
 import io.iohk.atala.agent.walletapi.model.error.{*, given}
 import io.iohk.atala.agent.walletapi.service.ManagedDIDService.DEFAULT_MASTER_KEY_ID
-import io.iohk.atala.agent.walletapi.storage.{
-  DIDNonSecretStorage,
-  DIDSecretStorage,
-  InMemoryDIDNonSecretStorage,
-  InMemoryDIDSecretStorage
-}
+import io.iohk.atala.agent.walletapi.storage.{DIDNonSecretStorage, DIDSecretStorage}
 import io.iohk.atala.agent.walletapi.util.{
   ManagedDIDTemplateValidator,
   OperationFactory,
@@ -383,11 +378,6 @@ object ManagedDIDService {
 
   val reservedKeyIds: Set[String] = Set(DEFAULT_MASTER_KEY_ID)
 
-  def inMemoryStorage: URLayer[DIDOperationValidator & DIDService, ManagedDIDService] =
-    (InMemoryDIDNonSecretStorage.layer ++ InMemoryDIDSecretStorage.layer) >>> ZLayer.fromFunction(
-      ManagedDIDService(_, _, _, _)
-    )
-
   val layer: URLayer[DIDOperationValidator & DIDService & DIDSecretStorage & DIDNonSecretStorage, ManagedDIDService] =
     ZLayer.fromFunction(ManagedDIDService(_, _, _, _))
 

diff --git a/...ce/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/sql/JdbcDIDSecretStorage.scala b/...ce/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/sql/JdbcDIDSecretStorage.scala
@@ -23,6 +23,7 @@ import io.iohk.atala.agent.walletapi.model.ECKeyPair
 import com.nimbusds.jose.jwk.OctetKeyPair
 import io.iohk.atala.prism.crypto.EC
 import io.iohk.atala.shared.utils.Base64Utils
+import scala.collection.immutable.ArraySeq
 
 class JdbcDIDSecretStorage(xa: Transactor[Task]) extends DIDSecretStorage {
 
@@ -106,17 +107,18 @@ class JdbcDIDSecretStorage(xa: Transactor[Task]) extends DIDSecretStorage {
     Clock.instant.flatMap(cxnIO(_).run.transact(xa))
   }
 
-  override def listKeys(did: PrismDID): Task[Map[String, ECKeyPair]] = {
+  override def listKeys(did: PrismDID): Task[Seq[(String, ArraySeq[Byte], ECKeyPair)]] = {
     val cxnIO = sql"""
         | SELECT
         |   key_id,
+        |   operation_hash,
         |   key_pair
         | FROM public.prism_did_secret_storage
         | WHERE
         |   did = $did
         """.stripMargin
-      .query[(String, ECKeyPair)]
-      .toMap
+      .query[(String, ArraySeq[Byte], ECKeyPair)]
+      .to[List]
 
     cxnIO.transact(xa)
   }

diff --git a/...ce/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/storage/DIDSecretStorage.scala b/...ce/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/storage/DIDSecretStorage.scala
@@ -9,12 +9,13 @@ import zio.*
 import io.iohk.atala.mercury.PeerDID
 import com.nimbusds.jose.jwk.OctetKeyPair
 import io.iohk.atala.mercury.model.DidId
+import scala.collection.immutable.ArraySeq
 
 /** A simple single-user DID key storage */
 trait DIDSecretStorage {
 
-  /** Returns a mapping of key-id to key-pair */
-  def listKeys(did: PrismDID): Task[Map[String, ECKeyPair]]
+  /** Returns a list of keys */
+  def listKeys(did: PrismDID): Task[Seq[(String, ArraySeq[Byte], ECKeyPair)]]
 
   /** Returns the key of confirmed operation */
   def getKey(did: PrismDID, keyId: String): Task[Option[ECKeyPair]]

diff --git a/...pi/src/main/scala/io/iohk/atala/agent/walletapi/storage/InMemoryDIDNonSecretStorage.scala b/...pi/src/main/scala/io/iohk/atala/agent/walletapi/storage/InMemoryDIDNonSecretStorage.scala
diff --git a/...t-api/src/main/scala/io/iohk/atala/agent/walletapi/storage/InMemoryDIDSecretStorage.scala b/...t-api/src/main/scala/io/iohk/atala/agent/walletapi/storage/InMemoryDIDSecretStorage.scala
diff --git a/prism-agent/service/wallet-api/src/test/resources/logback.xml b/prism-agent/service/wallet-api/src/test/resources/logback.xml
@@ -0,0 +1,20 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%level] %logger{15} - %message%n%rEx%xException{10}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="STDOUT"/>
+    </appender>
+
+    <!-- disable logger(s) that log too much when using test container -->
+    <logger name="com.zaxxer.hikari" level="OFF"/>
+
+    <root level="WARN">
+        <appender-ref ref="ASYNCSTDOUT"/>
+    </root>
+
+</configuration>