Merge branch 'release/v1.0.1'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethr-did-resolver",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Resolve DID documents around ethereum addresses",
   "main": "dist/ethr-did-resolver.js",
   "source": "src/ethr-did-resolver.js",

src/__tests__/ethr-did-resolver-test.js

@@ -1,5 +1,5 @@
 import { Resolver } from 'did-resolver'
-import getResolver, { stringToBytes32, delegateTypes } from '../ethr-did-resolver'
+import { getResolver, stringToBytes32, delegateTypes } from '../ethr-did-resolver'
 import Contract from 'truffle-contract'
 import DidRegistryContract from 'ethr-did-registry'
 import Web3 from 'web3'

src/ethr-did-resolver.js

@@ -5,15 +5,15 @@ import BN from 'bn.js'
 import EthContract from 'ethjs-contract'
 import DidRegistryContract from '../contracts/ethr-did-registry.json'
 import { Buffer } from 'buffer'
-export const REGISTRY = '0xdca7ef03e98e0dc2b855be647c39abe984fcf21b'
+const REGISTRY = '0xdca7ef03e98e0dc2b855be647c39abe984fcf21b'
 
-export function bytes32toString (bytes32) {
+function bytes32toString (bytes32) {
   return Buffer.from(bytes32.slice(2), 'hex')
     .toString('utf8')
     .replace(/\0+$/, '')
 }
 
-export function stringToBytes32 (str) {
+function stringToBytes32 (str) {
   const buffstr =
     '0x' +
     Buffer.from(str)
@@ -22,17 +22,17 @@ export function stringToBytes32 (str) {
   return buffstr + '0'.repeat(66 - buffstr.length)
 }
 
-export const delegateTypes = {
+const delegateTypes = {
   Secp256k1SignatureAuthentication2018: stringToBytes32('sigAuth'),
   Secp256k1VerificationKey2018: stringToBytes32('veriKey')
 }
 
-export const attrTypes = {
+const attrTypes = {
   sigAuth: 'SignatureAuthentication2018',
   veriKey: 'VerificationKey2018'
 }
 
-export function wrapDidDocument (did, owner, history) {
+function wrapDidDocument (did, owner, history) {
   const now = new BN(Math.floor(new Date().getTime() / 1000))
   // const expired = {}
   const publicKey = [
@@ -175,7 +175,7 @@ function configureProvider (conf = {}) {
   }
 }
 
-export default function getResolver (conf = {}) {
+function getResolver (conf = {}) {
   const provider = configureProvider(conf)
   const eth = new Eth(provider)
   const registryAddress = conf.registry || REGISTRY
@@ -224,3 +224,13 @@ export default function getResolver (conf = {}) {
 
   return { 'ethr': resolve }
 }
+
+module.exports = {
+  REGISTRY,
+  bytes32toString,
+  stringToBytes32,
+  delegateTypes,
+  attrTypes,
+  wrapDidDocument,
+  getResolver
+}