No more fs.readFileSync and different hash functions

README.md

@@ -13,12 +13,35 @@
 
 ## Table of Contents
 
-- [Install](#install)
-- [Architecture](#architecture)
-- [Usage](#usage)
-- [API](#api)
-- [Contribute](#contribute)
-- [License](#license)
+* [Table of Contents](#table-of-contents)
+* [Install](#install)
+* [Architecture](#architecture)
+* [Usage](#usage)
+* [API](#api)
+  + [DAGNode Class](#dagnode-class)
+    - [`addNodeLink`](#addnodelink)
+    - [`addRawLink`](#addrawlink)
+    - [`updateNodeLink`](#updatenodelink)
+    - [`removeNodeLink`](#removenodelink)
+    - [`removeNodeLinkByHash`](#removenodelinkbyhash)
+    - [`copy`](#copy)
+    - [`size`](#size)
+    - [`links`](#links)
+    - [`multihash(fn)`](#multihashfn)
+    - [`marshal`](#marshal)
+    - [`unMarshal`](#unmarshal)
+    - [`getPBNode`](#getpbnode)
+    - [`makeLink`](#makelink)
+  + [DAGLink Class](#daglink-class)
+  + [DAGService](#dagservice)
+    - [`put`](#put)
+    - [`putStream`](#putstream)
+    - [`get`](#get)
+    - [`getStream`](#getstream)
+    - [`getRecursive`](#getrecursive)
+    - [`getRecursiveStream`](#getrecursivestream)
+    - [`remove`](#remove)
+* [License](#license)
 
 ## Install
 
@@ -99,10 +122,12 @@ var node = new ipfsMDAG.DAGNode([<data>, <[links]>])
 
 > (property) an array of `DAGLink`s belonging to the node
 
-#### `multihash`
+#### `multihash(fn)`
 
 > returns the multihash (default: sha2-256)
 
+`fn` can be any hash function that [`multihashing`](https://github.com/multiformats/js-multihashing) understands.
+
 #### `marshal`
 
 > returns a protobuf serialized version, compatible with go-ipfs MerkleDAG

src/dag-node.js

@@ -2,14 +2,12 @@
 
 const protobuf = require('protocol-buffers')
 const stable = require('stable')
-const fs = require('fs')
-const path = require('path')
 const mh = require('multihashes')
 
 const util = require('./util')
 const DAGLink = require('./dag-link')
 
-const proto = protobuf(fs.readFileSync(path.join(__dirname, 'merkledag.proto')))
+const proto = protobuf(require('./merkledag.proto'))
 
 function linkSort (a, b) {
   return (new Buffer(a.name || '', 'ascii').compare(new Buffer(b.name || '', 'ascii')))
@@ -139,8 +137,8 @@ module.exports = class DAGNode {
   }
 
   // multihash - returns the multihash value of this DAGNode
-  multihash () {
-    this.encoded()
+  multihash (fn) {
+    this.encoded(fn)
     return this._cached
   }
 
@@ -157,12 +155,17 @@ module.exports = class DAGNode {
 
   // Encoded returns the encoded raw data version of a Node instance.
   // It may use a cached encoded version, unless the force flag is given.
-  encoded (force) {
+  encoded (fn, force) {
+    if (typeof fn === 'boolean') {
+      force = fn
+      fn = undefined
+    }
+
     if (force || !this._encoded) {
       this._encoded = this.marshal()
 
       if (this._encoded) {
-        this._cached = util.hash(this._encoded)
+        this._cached = util.hash(this._encoded, fn)
       }
     }
     return this._encoded

src/merkledag.proto → src/merkledag.proto.js

@@ -1,3 +1,6 @@
+'use strict'
+
+module.exports = new Buffer(`
 // An IPFS MerkleDAG Link
 message PBLink {
 
@@ -20,3 +23,4 @@ message PBNode {
   // opaque user data
   optional bytes Data = 1;
 }
+`)

src/util.js

@@ -4,5 +4,12 @@ const multihashing = require('multihashing')
 
 exports = module.exports
 
-// Hash is the global IPFS hash function. uses multihash SHA2_256, 256 bits
-exports.hash = (data) => multihashing(data, 'sha2-256')
+// Hash is the global IPFS hash function.
+// Uses multihash SHA2_256, 256 bits as the default
+exports.hash = (data, fn) => {
+  if (!fn) {
+    fn = 'sha2-256'
+  }
+
+  return multihashing(data, fn)
+}

test/dag-node-test.js

@@ -8,6 +8,7 @@ const DAGNode = require('../src').DAGNode
 const BlockService = require('ipfs-block-service')
 const Block = require('ipfs-block')
 const bs58 = require('bs58')
+const mh = require('multihashes')
 
 module.exports = function (repo) {
   describe('DAGNode', function () {
@@ -57,6 +58,22 @@ module.exports = function (repo) {
       done()
     })
 
+    describe('multihash', () => {
+      it('defaults to sha2-256', () => {
+        const node = new DAGNode(new Buffer('4444'))
+        const res = mh.decode(node.multihash())
+
+        expect(res).to.have.property('name', 'sha2-256')
+      })
+
+      it('can use a different hash function', () => {
+        const node = new DAGNode(new Buffer('4444'))
+        const res = mh.decode(node.multihash('sha1'))
+
+        expect(res).to.have.property('name', 'sha1')
+      })
+    })
+
     it('create a link', function (done) {
       const buf = new Buffer('multihash of file.txt')
       const link = new DAGLink('file.txt', 10, buf)