chore: resolve feedback

Signed-off-by: Berend Sliedrecht <berend@animo.id>

packages/askar/src/wallet/AskarBaseWallet.ts

@@ -28,7 +28,7 @@ import {
   KeyBackend,
   KeyType,
   utils,
-  expandIfPossible,
+  expandPublicKeyIfPossible,
 } from '@credo-ts/core'
 import {
   CryptoBox,
@@ -181,7 +181,7 @@ export abstract class AskarBaseWallet implements Wallet {
           // This will be fixed once we use the new 'using' syntax
           key = _key
 
-          const keyPublicBytes = expandIfPossible(key.publicBytes, keyType)
+          const keyPublicBytes = expandPublicKeyIfPossible(key.publicBytes, keyType)
 
           // Store key
           await this.withSession((session) =>
@@ -208,7 +208,7 @@ export abstract class AskarBaseWallet implements Wallet {
         await secureEnvironment.generateKeypair(kid)
         const compressedPublicKeyBytes = await secureEnvironment.getPublicBytesForKeyId(kid)
 
-        const publicKeyBytes = expandIfPossible(compressedPublicKeyBytes, keyType)
+        const publicKeyBytes = expandPublicKeyIfPossible(compressedPublicKeyBytes, keyType)
         const publicKeyBase58 = TypedArrayEncoder.toBase58(publicKeyBytes)
 
         await this.storeSecureEnvironmentKeyById({
@@ -351,9 +351,12 @@ export abstract class AskarBaseWallet implements Wallet {
       if (!isError(error)) {
         throw new CredoError('Attempted to throw error, but it was not of type Error', { cause: error })
       }
-      throw new WalletError(`Error signing data with key associated with ${key.publicKeyBase58}. ${error.message}`, {
-        cause: error,
-      })
+      throw new WalletError(
+        `Error signing data with key associated with publicKeyBase58 ${key.publicKeyBase58}. ${error.message}`,
+        {
+          cause: error,
+        }
+      )
     } finally {
       askarKey?.handle.free()
     }

packages/bbs-signatures/tests/bbs-signing-provider.test.ts

@@ -52,7 +52,7 @@ describeSkipNode18('BBS Signing Provider', () => {
         key,
       })
     ).rejects.toThrow(
-      'Error signing data with key associated with AeAihfn5UFf7y9oesemKE1oLmTwKMRv7fafTepespr3qceF4RUMggAbogkoC8n6rXgtJytq4oGy59DsVHxmNj9WGWwkiRnP3Sz2r924RLVbc2NdP4T7yEPsSFZPsWmLjgnP1vXHpj4bVXNcTmkUmF6mSXinF3HehnQVip14vRFuMzYVxMUh28ofTJzbtUqxMWZQRu. Unsupported keyType: bls12381g1g2'
+      'Error signing data with key associated with publicKeyBase58 AeAihfn5UFf7y9oesemKE1oLmTwKMRv7fafTepespr3qceF4RUMggAbogkoC8n6rXgtJytq4oGy59DsVHxmNj9WGWwkiRnP3Sz2r924RLVbc2NdP4T7yEPsSFZPsWmLjgnP1vXHpj4bVXNcTmkUmF6mSXinF3HehnQVip14vRFuMzYVxMUh28ofTJzbtUqxMWZQRu. Unsupported keyType: bls12381g1g2'
     )
   })
 

packages/core/src/crypto/Key.ts

@@ -2,7 +2,7 @@ import type { KeyType } from './KeyType'
 
 import { MultiBaseEncoder, TypedArrayEncoder, VarintEncoder } from '../utils'
 
-import { compressIfPossible, expandIfPossible } from './jose/jwk/ecCompression'
+import { compressIfPossible, expandPublicKeyIfPossible } from './jose/jwk/ecCompression'
 import { isEncryptionSupportedForKeyType, isSigningSupportedForKeyType } from './keyUtils'
 import { getKeyTypeByMultiCodecPrefix, getMultiCodecPrefixByKeyType } from './multiCodecKey'
 
@@ -11,7 +11,7 @@ export class Key {
   public readonly keyType: KeyType
 
   public constructor(publicKey: Uint8Array, keyType: KeyType) {
-    this.publicKey = expandIfPossible(publicKey, keyType)
+    this.publicKey = expandPublicKeyIfPossible(publicKey, keyType)
     this.keyType = keyType
   }
 

packages/core/src/crypto/jose/jwk/ecCompression.ts

@@ -90,7 +90,7 @@ export function compressIfPossible(publicKey: Uint8Array, keyType: KeyType): Uin
   return isValidUncompressedPublicKey(publicKey, keyType) ? compress(publicKey) : publicKey
 }
 
-export function expandIfPossible(publicKey: Uint8Array, keyType: KeyType): Uint8Array {
+export function expandPublicKeyIfPossible(publicKey: Uint8Array, keyType: KeyType): Uint8Array {
   return isValidCompressedPublicKey(publicKey, keyType) ? expand(publicKey, keyType as CompressableKey) : publicKey
 }
 

tests/InMemoryWallet.ts

@@ -12,7 +12,7 @@ import { CryptoBox, Store, Key as AskarKey, keyAlgFromString } from '@hyperledge
 
 import { convertToAskarKeyBackend } from '../packages/askar/src/utils/askarKeyBackend'
 import { didcommV1Pack, didcommV1Unpack } from '../packages/askar/src/wallet/didcommV1'
-import { expandIfPossible } from '../packages/core/src/crypto/jose/jwk/ecCompression'
+import { expandPublicKeyIfPossible } from '../packages/core'
 
 import {
   JsonEncoder,
@@ -185,7 +185,7 @@ export class InMemoryWallet implements Wallet {
         const keyPublicBytes = key.publicBytes
 
         // Store key
-        this.getInMemoryKeys()[TypedArrayEncoder.toBase58(expandIfPossible(keyPublicBytes, keyType))] = {
+        this.getInMemoryKeys()[TypedArrayEncoder.toBase58(expandPublicKeyIfPossible(keyPublicBytes, keyType))] = {
           publicKeyBytes: keyPublicBytes,
           secretKeyBytes: key.secretBytes,
           keyType,