Skip to content
This repository has been archived by the owner on May 19, 2023. It is now read-only.

Add rsk #1

Merged
merged 3 commits into from
Jun 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ function sleep (seconds) {
return new Promise(resolve => setTimeout(resolve, seconds * 1000))
}

describe('EthrDID', () => {
const namesAndMethods = [
['ethereum', null, null],
['ethereum - method ethr', null, 'ethr'],
['rsk - method ethr:rsk', 'rsk', 'ethr:rsk']
]

describe.each(namesAndMethods)('EthrDID %s', (_, name, method) => {
let ethrDid,
plainDid,
registry,
Expand Down Expand Up @@ -43,21 +49,40 @@ describe('EthrDID', () => {
owner = accounts[2].toLowerCase()
delegate1 = accounts[3].toLowerCase()
delegate2 = accounts[4].toLowerCase()
did = `did:ethr:${identity}`
did = `did:${method || 'ethr'}:${identity}`

registry = await DidReg.new({
from: accounts[0],
gasPrice: 100000000000,
gas: 4712388
})
ethrDid = new EthrDID({
provider,
registry: registry.address,
address: identity
})
resolver = new Resolver(
getResolver({ provider, registry: registry.address })
)

if (method) {
ethrDid = new EthrDID({
provider,
registry: registry.address,
address: identity,
method
})
} else {
ethrDid = new EthrDID({
provider,
registry: registry.address,
address: identity
})
}

if (name) {
resolver = new Resolver(
getResolver({
networks: [{ provider, registry: registry.address, name }]
})
)
} else {
resolver = new Resolver(
getResolver({ provider, registry: registry.address })
)
}
})

describe('presets', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default class EthrDID {
this.registry = DidReg.at(registryAddress)
this.address = conf.address
if (!this.address) throw new Error('No address is set for EthrDid')
this.did = `did:ethr:${this.address}`
this.did = `did:${conf.method || 'ethr'}:${this.address}`
if (conf.signer) {
this.signer = conf.signer
} else if (conf.privateKey) {
Expand Down