tests(integration/identity): Using a custom resolver

Tests currently fail because of a breaking change in #399.
Furthermore, a better API for passing in a custom resolover is needed

tests/integration/identity.integration.ts

@@ -25,6 +25,7 @@ import { testSeed } from '../data/keys.data'
 import { ContractsGateway } from '../../ts/contracts/contractsGateway'
 import { ContractsAdapter } from '../../ts/contracts/contractsAdapter'
 import { Resolver } from 'did-resolver'
+import { ErrorCodes } from '../../ts/errors'
 
 chai.use(sinonChai)
 const expect = chai.expect
@@ -35,6 +36,7 @@ export let userIdentityWallet: IdentityWallet
 export let serviceIdentityWallet: IdentityWallet
 export let testContractsGateway: ContractsGateway
 export let testContractsAdapter: ContractsAdapter
+export let testResolver: Resolver
 
 before(async () => {
   const {
@@ -51,14 +53,18 @@ before(async () => {
     contracts: { gateway, adapter },
   })
 
-  jolocomRegistry.resolver = new Resolver(
+  const {host, protocol, port} = testIpfsConfig
+
+  testResolver = new Resolver(
     getResolver(
       testEthereumConfig.providerUrl,
       testEthereumConfig.contractAddress,
-      testIpfsConfig.host
+      `${protocol}://${host}:${port}`
     )
   )
 
+  jolocomRegistry.resolver = testResolver
+
   userIdentityWallet = await jolocomRegistry.create(userVault, userPass)
   serviceIdentityWallet = await jolocomRegistry.create(
     serviceVault,
@@ -75,6 +81,7 @@ describe('Integration Test - Create, Resolve, Public Profile', () => {
     const remoteUserIdentity = await jolocomRegistry.resolve(
       userIdentityWallet.did,
     )
+
     const remoteServiceIdentity = await jolocomRegistry.resolve(
       serviceIdentityWallet.did,
     )
@@ -151,8 +158,8 @@ describe('Integration Test - Create, Resolve, Public Profile', () => {
         encryptionPass: 'pass',
       })
     } catch (err) {
-      expect(err.message).to.eq(
-        'Could not retrieve DID Document. No record for DID found.',
+      expect(err.message).to.contain(
+        ErrorCodes.RegistryDIDNotAnchored
       )
     }
   })

ts/registries/jolocomRegistry.ts

@@ -151,13 +151,13 @@ export class JolocomRegistry implements IRegistry {
    */
 
   public async resolve(did: string): Promise<Identity> {
-    try {
-      const jsonDidDoc = await this.resolver.resolve(did)
+    const jsonDidDoc = await this.resolver.resolve(did)
 
-      if (!jsonDidDoc) {
-        throw new Error(ErrorCodes.RegistryDIDNotAnchored)
-      }
+    if (!jsonDidDoc) {
+      throw new Error(ErrorCodes.RegistryDIDNotAnchored)
+    }
 
+    try {
       //@ts-ignore TODO IDidDoc vs IDidDocumentAttrs
       const didDocument = DidDocument.fromJSON(jsonDidDoc)
       const publicProfileJson = await getPublicProfile(jsonDidDoc)