fix: rename KeyTypes (#2)

jolocom · Mar 14, 2021 · e0fee56 · e0fee56
1 parent 7e74be7
commit e0fee56
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/dist/lib/contracts.d.ts b/dist/lib/contracts.d.ts
@@ -1,4 +1,3 @@
-import { IVaultedKeyProvider } from './vaultedKeyProvider';
 interface ContractsGatewayInfo {
     name: string;
     chainId: number;
@@ -9,7 +8,7 @@ interface AddressInfo {
     balance: number;
 }
 export interface IContractsAdapter {
-    assembleTxFromInteractionToken: (requestToken: ITransactionEncodable, from: string, nonce: number, vault: IVaultedKeyProvider, pass: string) => string;
+    assembleTxFromInteractionToken: (requestToken: ITransactionEncodable, from: string, nonce: number, vault: any, pass: string) => string;
 }
 export interface IContractsGateway {
     getNetworkInfo: () => ContractsGatewayInfo | {};

diff --git a/dist/lib/vaultedKeyProvider.d.ts b/dist/lib/vaultedKeyProvider.d.ts
@@ -1,16 +1,16 @@
 /// <reference types="node" />
 import { IDigestable } from './linkedDataSignature';
-export declare enum KeyTypes {
+export declare enum KeyPaths {
     jolocomIdentityKey = "m/73'/0'/0'/0",
     ethereumKey = "m/44'/60'/0'/0/0"
 }
-export declare enum SchemeTypes {
+export declare enum KeyTypes {
     secp256k1 = "EcdsaSecp256k1",
     x25519 = "X25519"
 }
 export interface IVaultedKeyProvider {
-    getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer;
-    getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer;
+    getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer;
+    getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer;
     sign: (derivationArgs: IKeyDerivationArgs, digest: Buffer) => Buffer;
     signDigestable: (derivationArgs: IKeyDerivationArgs, toSign: IDigestable) => Promise<Buffer>;
     asymEncrypt: (data: Buffer, pubKey: Buffer) => Promise<string>;

diff --git a/dist/lib/vaultedKeyProvider.js b/dist/lib/vaultedKeyProvider.js
diff --git a/lib/vaultedKeyProvider.ts b/lib/vaultedKeyProvider.ts
@@ -1,18 +1,18 @@
 import { IDigestable } from './linkedDataSignature'
 
-export enum KeyTypes {
+export enum KeyPaths {
   jolocomIdentityKey = "m/73'/0'/0'/0",
   ethereumKey = "m/44'/60'/0'/0/0",
 }
 
-export enum SchemeTypes {
+export enum KeyTypes {
   secp256k1 = "EcdsaSecp256k1",
   x25519 = "X25519"
 }
 
 export interface IVaultedKeyProvider {
-  getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer
-  getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer
+  getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer
+  getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer
   sign: (derivationArgs: IKeyDerivationArgs, digest: Buffer) => Buffer
   signDigestable: (
     derivationArgs: IKeyDerivationArgs,