align core unit tests

cardano-foundation · May 25, 2021 · cc5f4b0 · cc5f4b0
1 parent 8e25234
commit cc5f4b0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/lib/core/test/data/Cardano/Wallet/Api/ApiVerificationKeyShelley.json b/lib/core/test/data/Cardano/Wallet/Api/ApiVerificationKeyShelley.json
diff --git a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
@@ -1724,9 +1724,17 @@ instance Arbitrary (Quantity "percent" Double) where
 
 instance Arbitrary ApiVerificationKeyShelley where
     arbitrary =
-        fmap ApiVerificationKeyShelley . (,)
-            <$> fmap B8.pack (replicateM 32 arbitrary)
-            <*> elements [UtxoExternal, UtxoInternal, MutableAccount]
+        oneof [noHashedGen, hashedGen]
+      where
+          noHashedGen = do
+              payload' <- fmap B8.pack (replicateM 32 arbitrary)
+              role' <- elements [UtxoExternal, MutableAccount]
+              pure $ ApiVerificationKeyShelley (payload', role') WithoutHashing
+
+          hashedGen = do
+              payload' <- fmap B8.pack (replicateM 28 arbitrary)
+              role' <- elements [UtxoExternal, MutableAccount]
+              pure $ ApiVerificationKeyShelley (payload', role') WithHashing
 
 instance ToSchema ApiVerificationKeyShelley where
     declareNamedSchema _ = declareSchemaForDefinition "ApiVerificationKeyShelley"

diff --git a/specifications/api/swagger.yaml b/specifications/api/swagger.yaml
@@ -1869,7 +1869,7 @@ components:
     ApiVerificationKeyShelley: &ApiVerificationKeyShelley
       type: string
       format: bech32
-      pattern: "^((addr_vk)|(stake_vk))1[0-9a-z]*$"
+      pattern: "^((addr_vk)|(stake_vk)|(addr_vkh)|(stake_vkh))1[0-9a-z]*$"
 
     ApiVerificationKeyShared: &ApiVerificationKeyShared
       type: string
@@ -4548,7 +4548,7 @@ paths:
       responses: *responsesPostAccountKey
 
   /wallets/{walletId}/keys:
-    post:
+    get:
       operationId: getAccountKey
       tags: ["Keys"]
       summary: Get