fix: imports from core (openwallet-foundation#1303)

Signed-off-by: Ariel Gentile <gentilester@gmail.com>
karimStekelenburg · Feb 15, 2023 · 3e02227 · 3e02227
1 parent 4ac5332
commit 3e02227
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 53 deletions.
diff --git a/packages/anoncreds-rs/src/services/AnonCredsRsHolderService.ts b/packages/anoncreds-rs/src/services/AnonCredsRsHolderService.ts
@@ -24,7 +24,7 @@ import {
   AnonCredsLinkSecretRepository,
   AnonCredsCredentialRepository,
 } from '@aries-framework/anoncreds'
-import { injectable } from '@aries-framework/core'
+import { utils, injectable } from '@aries-framework/core'
 import {
   CredentialRequestMetadata,
   Credential,
@@ -40,7 +40,6 @@ import {
   Schema,
 } from '@hyperledger/anoncreds-shared'
 
-import { uuid } from '../../../core/src/utils/uuid'
 import { AnonCredsRsError } from '../errors/AnonCredsRsError'
 
 @injectable()
@@ -51,7 +50,7 @@ export class AnonCredsRsHolderService implements AnonCredsHolderService {
   ): Promise<CreateLinkSecretReturn> {
     try {
       return {
-        linkSecretId: options?.linkSecretId ?? uuid(),
+        linkSecretId: options?.linkSecretId ?? utils.uuid(),
         linkSecretValue: JSON.parse(MasterSecret.create().toJson()).value.ms,
       }
     } catch (error) {
@@ -230,7 +229,7 @@ export class AnonCredsRsHolderService implements AnonCredsHolderService {
       ? RevocationRegistryDefinition.load(JSON.stringify(revocationRegistry.definition))
       : undefined
 
-    const credentialId = options.credentialId ?? uuid()
+    const credentialId = options.credentialId ?? utils.uuid()
     const processedCredential = Credential.load(JSON.stringify(credential)).process({
       credentialDefinition: CredentialDefinition.load(JSON.stringify(credentialDefinition)),
       credentialRequestMetadata: CredentialRequestMetadata.load(JSON.stringify(credentialRequestMetadata)),

diff --git a/packages/askar/src/AskarModuleConfig.ts b/packages/askar/src/AskarModuleConfig.ts
diff --git a/packages/askar/src/index.ts b/packages/askar/src/index.ts
@@ -6,4 +6,3 @@ export { AskarStorageService } from './storage'
 
 // Module
 export { AskarModule } from './AskarModule'
-export { AskarModuleConfig } from './AskarModuleConfig'
diff --git a/packages/askar/src/wallet/AskarWallet.ts b/packages/askar/src/wallet/AskarWallet.ts
@@ -49,7 +49,6 @@ const isError = (error: unknown): error is Error => error instanceof Error
 
 import { inject, injectable } from 'tsyringe'
 
-import { encodeToBase58, decodeFromBase58 } from '../../../core/src/utils/base58'
 import {
   askarErrors,
   isAskarError,
@@ -364,7 +363,7 @@ export class AskarWallet implements Wallet {
         const key = seed ? AskarKey.fromSeed({ seed: Buffer.from(seed), algorithm }) : AskarKey.generate(algorithm)
 
         // Store key
-        await this.session.insertKey({ key, name: encodeToBase58(key.publicBytes) })
+        await this.session.insertKey({ key, name: TypedArrayEncoder.toBase58(key.publicBytes) })
         return Key.fromPublicKey(key.publicBytes, keyType)
       } else {
         // Check if there is a signing key provider for the specified key type.
@@ -633,7 +632,7 @@ export class AskarWallet implements Wallet {
           )
           const sender_x = AskarKey.fromPublicBytes({
             algorithm: KeyAlgs.Ed25519,
-            publicKey: decodeFromBase58(senderKey),
+            publicKey: TypedArrayEncoder.fromBase58(senderKey),
           }).convertkey({ algorithm: KeyAlgs.X25519 })
 
           payloadKey = CryptoBox.open({

diff --git a/packages/askar/src/wallet/AskarWalletPostgresStorageConfig.ts b/packages/askar/src/wallet/AskarWalletPostgresStorageConfig.ts
@@ -1,4 +1,4 @@
-import type { WalletStorageConfig } from '../../../core/src/types'
+import type { WalletStorageConfig } from '@aries-framework/core'
 
 export interface AskarWalletPostgresConfig {
   host: string

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -26,6 +26,7 @@ export type {
   JsonValue,
   WalletConfigRekey,
   WalletExportImportConfig,
+  WalletStorageConfig,
 } from './types'
 export { DidCommMimeType, KeyDerivationMethod } from './types'
 export type { FileSystem, DownloadToFileOptions } from './storage/FileSystem'