Merge pull request #14 from blockchain-certificates/chore/extract-typ…

…es-to-explorer-lookup Chore/extract types to explorer lookup
blockchain-certificates · Feb 24, 2021 · 6792dfe · 6792dfe
2 parents f9ce6ad + 4d1d815
commit 6792dfe
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 59 deletions.
diff --git a/src/MerkleProof2019.ts b/src/MerkleProof2019.ts
@@ -1,13 +1,11 @@
 import { Decoder } from '@vaultie/lds-merkle-proof-2019';
 import jsigs from 'jsonld-signatures';
-import { lookForTx } from '@blockcerts/explorer-lookup';
+import { lookForTx, ExplorerAPI, TransactionData } from '@blockcerts/explorer-lookup';
 import { DecodedProof, JSONLDProof } from './models/Proof';
 import getTransactionId from './helpers/getTransactionId';
 import isTransactionIdValid from './inspectors/isTransactionIdValid';
-import { ExplorerAPI } from './models/Explorers';
 import { IBlockchainObject } from './constants/blockchains';
 import getChain from './helpers/getChain';
-import { TransactionData } from './models/TransactionData';
 import computeLocalHash from './inspectors/computeLocalHash';
 import ensureHashesEqual from './inspectors/ensureHashesEqual';
 import ensureMerkleRootEqual from './inspectors/ensureMerkleRootEqual';

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -1,7 +1,5 @@
-import { ExplorerAPI } from './models/Explorers';
 import { DecodedProof, JSONLDProof } from './models/Proof';
-import { TransactionData } from './models/TransactionData';
-import { IParsingFunctionAPI } from './explorers/explorer';
+import { ExplorerAPI, TransactionData, IParsingFunctionAPI } from '@blockcerts/explorer-lookup';
 import { IBlockchainObject } from './constants/blockchains';
 
 export interface MerkleProof2019Options {
@@ -25,7 +23,7 @@ export interface MerkleProof2019VerificationResult {
   error?: string;
 }
 
-declare class MerkleProof2019 {
+export declare class MerkleProof2019 {
   /* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-useless-constructor */
   public type: string;
   public issuer: any; // TODO: define issuer type
@@ -51,7 +49,6 @@ declare class MerkleProof2019 {
 
 export {
   ExplorerAPI,
-  TransactionData,
   IParsingFunctionAPI,
-  MerkleProof2019
+  TransactionData
 };
diff --git a/src/models/Explorers.ts b/src/models/Explorers.ts
diff --git a/src/models/TransactionData.ts b/src/models/TransactionData.ts
diff --git a/src/utils/ensureExplorerAPIValidity.ts b/src/utils/ensureExplorerAPIValidity.ts
@@ -1,4 +1,4 @@
-import { ExplorerAPI } from '../models/Explorers';
+import { ExplorerAPI } from '@blockcerts/explorer-lookup';
 
 function isPriorityValid (explorerAPI: ExplorerAPI): boolean {
   return explorerAPI.priority >= 0;

diff --git a/tests/MerkleProof2019.test.ts b/tests/MerkleProof2019.test.ts
@@ -2,7 +2,6 @@ import sinon from 'sinon';
 import * as explorerLookup from '@blockcerts/explorer-lookup';
 import { MerkleProof2019, MerkleProof2019Options, MerkleProof2019VerificationResult } from '../src/MerkleProof2019';
 import decodedProof, { assertionTransactionId } from './assertions/proof';
-import { TransactionData } from '../src/models/TransactionData';
 import { BLOCKCHAINS } from '../src/constants/blockchains';
 import blockcertsV3Fixture, { documentHash } from './fixtures/blockcerts-v3';
 import fixtureTransactionData from './fixtures/transactionData';
@@ -65,7 +64,7 @@ describe('MerkleProof2019 test suite', function () {
           explorerAPIs: [{
             serviceURL: 'https://explorer-example.com',
             priority: 0,
-            parsingFunction: (): TransactionData => fixtureTransactionData
+            parsingFunction: (): explorerLookup.TransactionData => fixtureTransactionData
           }]
         };
         const instance = new MerkleProof2019({ options: fixtureOptions, document: blockcertsV3Fixture });

diff --git a/tests/fixtures/transactionData.ts b/tests/fixtures/transactionData.ts
@@ -1,4 +1,4 @@
-import { TransactionData } from '../../src/models/TransactionData';
+import { TransactionData } from '@blockcerts/explorer-lookup';
 
 const fixtureTransactionData: TransactionData = {
   remoteHash: '2b065c69c70432e9f082629939733afd2343e83f45939519986e9a09cf8ccd08',

diff --git a/tests/utils/ensureExplorerAPIValidity.test.ts b/tests/utils/ensureExplorerAPIValidity.test.ts
@@ -1,5 +1,4 @@
-import { ExplorerAPI } from '../../src/models/Explorers';
-import { TransactionData } from '../../src/models/TransactionData';
+import { ExplorerAPI, TransactionData } from '@blockcerts/explorer-lookup';
 import ensureExplorerAPIValidity from '../../src/utils/ensureExplorerAPIValidity';
 
 describe('ensureExplorerAPIValidity test suite', function () {

diff --git a/tsconfig.json b/tsconfig.json
@@ -12,8 +12,7 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "outDir": "lib/esm",
-    "declaration": true
+    "outDir": "lib/esm"
   },
   "compileOnSave": false,
   "exclude": [