oceanprotocol/squid-js
1
0
Fork 0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Code Releases Activity

bring upto DIDTools changes

Browse Source
This commit is contained in:
Bill Barman 2018-11-22 16:45:22 +08:00
parent f15f318a7a
commit 21fac92a88
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/DIDResolved.ts
View File

@ -9,7 +9,7 @@ import DIDRecord from "../models/DIDRecord"
// import ValueType from "../models/ValueType" // import ValueType from "../models/ValueType"
// import * as Web3 from "web3" // import * as Web3 from "web3"
import * as DIDTools from "../DID" import * as DIDTools from "../utils/DIDTools"
export default class DIDResolved { export default class DIDResolved {
public items: DIDRecord[] public items: DIDRecord[]
@ -33,6 +33,16 @@ export default class DIDResolved {
return result 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 { public getValue(): string {
const item = this.getLastItem() const item = this.getLastItem()
let result: string = null let result: string = null

4
src/utils/DIDResolver.ts
View File

@ -11,7 +11,7 @@ import DIDRegistry from "../keeper/contracts/DIDRegistry"
import ValueType from "../models/ValueType" import ValueType from "../models/ValueType"
import * as Web3 from "web3" 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 maxHopCount = maxHopCount === undefined ? 0 : maxHopCount
let didId = DIDTools.DIDToId(did) let didId = DIDTools.didToId(did)
const resolved = new DIDResolved() const resolved = new DIDResolved()
let data: DIDRecord = await this.getDID(didId) let data: DIDRecord = await this.getDID(didId)
while ( data && (maxHopCount === 0 || resolved.hopCount() < maxHopCount) ) { while ( data && (maxHopCount === 0 || resolved.hopCount() < maxHopCount) ) {

8
test/keeper/DIDResolver.test.ts
View File

@ -10,7 +10,7 @@ import Ocean from "../../src/ocean/Ocean"
import config from "../config" import config from "../config"
import TestContractHandler from "./TestContractHandler" import TestContractHandler from "./TestContractHandler"
import * as DIDTools from "../../src/DID" import * as DIDTools from "../../src/utils/DIDTools"
import DIDResolver from "../../src/utils/DIDResolver" import DIDResolver from "../../src/utils/DIDResolver"
@ -32,7 +32,7 @@ describe("DIDResolver", () => {
const testId = IdGenerator.generateId() const testId = IdGenerator.generateId()
const did = DIDTools.idToDID(testId) const did = DIDTools.idToDID(testId)
const didId = DIDTools.DIDToId(did) const didId = DIDTools.didToId(did)
const ownerAccount: Account = (await ocean.getAccounts())[0] const ownerAccount: Account = (await ocean.getAccounts())[0]
const providerKey = Web3Provider.getWeb3().utils.fromAscii("provider") const providerKey = Web3Provider.getWeb3().utils.fromAscii("provider")
const testURL = "http://localhost:5000" const testURL = "http://localhost:5000"
@ -42,7 +42,11 @@ describe("DIDResolver", () => {
assert(receipt.events.DIDAttributeRegistered) assert(receipt.events.DIDAttributeRegistered)
const didResolver = new DIDResolver(didRegistry) const didResolver = new DIDResolver(didRegistry)
assert(didResolver)
const didResolved = await didResolver.resolve(did) const didResolved = await didResolver.resolve(did)
assert(didResolved)
assert(didResolved.isURL())
}) })