From 21fac92a8842418fc75a74178c02e71d8ed3b0d9 Mon Sep 17 00:00:00 2001
From: Bill Barman <bill@anantya.com>
Date: Thu, 22 Nov 2018 16:45:22 +0800
Subject: [PATCH] bring upto DIDTools changes

---
 src/utils/DIDResolved.ts        | 12 +++++++++++-
 src/utils/DIDResolver.ts        |  4 ++--
 test/keeper/DIDResolver.test.ts |  8 ++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/utils/DIDResolved.ts b/src/utils/DIDResolved.ts
index 2ac3006..cc6164b 100644
--- a/src/utils/DIDResolved.ts
+++ b/src/utils/DIDResolved.ts
@@ -9,7 +9,7 @@ import DIDRecord from "../models/DIDRecord"
 // import ValueType from "../models/ValueType"
 
 // import * as Web3 from "web3"
-import * as DIDTools from "../DID"
+import * as DIDTools from "../utils/DIDTools"
 
 export default class DIDResolved {
     public items: DIDRecord[]
@@ -33,6 +33,16 @@ export default class DIDResolved {
         return result
     }
 
+    public isURL(): boolean {
+        const item = this.getLastItem()
+        return item && item.valueType == "URL"
+    }
+    
+    public isDDO(): boolean {
+        const item = this.getLastItem()
+        return item && item.valueType == "DDO"
+    }
+    
     public getValue(): string {
         const item = this.getLastItem()
         let result: string = null
diff --git a/src/utils/DIDResolver.ts b/src/utils/DIDResolver.ts
index f1b0dc9..931456c 100644
--- a/src/utils/DIDResolver.ts
+++ b/src/utils/DIDResolver.ts
@@ -11,7 +11,7 @@ import DIDRegistry from "../keeper/contracts/DIDRegistry"
 import ValueType from "../models/ValueType"
 
 import * as Web3 from "web3"
-import * as DIDTools from "../DID"
+import * as DIDTools from "../utils/DIDTools"
 
 /*
  *
@@ -37,7 +37,7 @@ export default class DIDResolver {
 
         maxHopCount = maxHopCount === undefined ? 0 : maxHopCount
 
-        let didId = DIDTools.DIDToId(did)
+        let didId = DIDTools.didToId(did)
         const resolved = new DIDResolved()
         let data: DIDRecord = await this.getDID(didId)
         while ( data && (maxHopCount === 0 || resolved.hopCount() < maxHopCount) ) {
diff --git a/test/keeper/DIDResolver.test.ts b/test/keeper/DIDResolver.test.ts
index e4f13dd..9f17bb6 100644
--- a/test/keeper/DIDResolver.test.ts
+++ b/test/keeper/DIDResolver.test.ts
@@ -10,7 +10,7 @@ import Ocean from "../../src/ocean/Ocean"
 import config from "../config"
 import TestContractHandler from "./TestContractHandler"
 
-import * as DIDTools from "../../src/DID"
+import * as DIDTools from "../../src/utils/DIDTools"
 
 import DIDResolver from "../../src/utils/DIDResolver"
 
@@ -32,7 +32,7 @@ describe("DIDResolver", () => {
             const testId = IdGenerator.generateId()
 
             const did = DIDTools.idToDID(testId)
-            const didId = DIDTools.DIDToId(did)
+            const didId = DIDTools.didToId(did)
             const ownerAccount: Account = (await ocean.getAccounts())[0]
             const providerKey = Web3Provider.getWeb3().utils.fromAscii("provider")
             const testURL = "http://localhost:5000"
@@ -42,7 +42,11 @@ describe("DIDResolver", () => {
             assert(receipt.events.DIDAttributeRegistered)
 
             const didResolver = new DIDResolver(didRegistry)
+            assert(didResolver)
+            
             const didResolved = await didResolver.resolve(did)
+            assert(didResolved)
+            assert(didResolved.isURL())
 
         })