Extract CVCMerkleProof from the VC creation

This update separates the CvcMerkleProof from VC creation allowing for alternative proof mechanisms to be used.

PR: #226

Signed-off-by: William Brooks <[email protected]>
Reviewed-by: Julian Spring <[email protected]>
Reviewed-by: Tighe Barris <[email protected]>

Author: William Brooks

__integrations__/credentials/VerifiableCredential.test.js

@@ -1,6 +1,5 @@
 const uuidv4 = require('uuid/v4');
 const { Claim } = require('claim/Claim');
-const VC = require('creds/VerifiableCredential');
 const { schemaLoader, CVCSchemaLoader } = require('index');
 const didTestUtil = require("../../__test__/lib/util/did");
 
@@ -58,7 +57,6 @@ describe('Integration Tests for Verifiable Credentials', () => {
       { givenNames: 'Joao', otherNames: 'Barbosa', familyNames: 'Santos' });
 
     const dob = await Claim.create('claim-cvc:Identity.dateOfBirth-v1', { day: 20, month: 3, year: 1978 });
-    // const cred = await VC.create('credential-cvc:Identity-v3', uuidv4(), null, credentialSubject, [name, dob]);
 
     const unsignedCred = await VerifiableCredential.create({
       issuer: didTestUtil.DID_CONTROLLER,

__test__/creds/VerifiableCredential.test.js

@@ -3,7 +3,6 @@ const fs = require('fs');
 const uuidv4 = require('uuid/v4');
 const sjcl = require('sjcl');
 const {Claim} = require('claim/Claim');
-const VC = require('creds/VerifiableCredential');
 const MiniCryptoManagerImpl = require('services/MiniCryptoManagerImpl');
 const didTestUtil = require('../lib/util/did');
 const solResolver = require('lib/did');

__test__/index.test.js

@@ -1,7 +1,7 @@
 const CredentialCommons = require('index');
 const httpMock = require('services/__mocks__/httpService');
 
-const { Claim, VC } = CredentialCommons;
+const { Claim, VerifiableCredential } = CredentialCommons;
 
 describe('Module Entry Point Tests', () => {
   it('should access the entry point e see if the modules are declared', () => {
@@ -18,9 +18,10 @@ describe('Module Entry Point Tests', () => {
       passphrase: '',
       keychain: { prv: '' },
     };
+
     CredentialCommons.init(confMock, httpMock);
     expect(Claim).toBeDefined();
-    expect(VC).toBeDefined();
+    expect(VerifiableCredential).toBeDefined();
   });
 
   it('Should initialize with custom SecureRandom', () => {
@@ -42,6 +43,6 @@ describe('Module Entry Point Tests', () => {
 
     CredentialCommons.init(confMock, httpMock, myCustomSecureRandom);
     expect(Claim).toBeDefined();
-    expect(VC).toBeDefined();
+    expect(VerifiableCredential).toBeDefined();
   });
 });

__test__/lib/resolver.test.js

@@ -83,7 +83,6 @@ describe("DiDResolver", () => {
                 },
 
                 async verify(vc) {
-                    console.log(keypair);
                     const verifier = keypair.verifier();
                     return verifier.verify({
                         data: vc.proof.merkleRoot,