for testing purposes

Author: daviddias

package.json

@@ -2,7 +2,7 @@
   "name": "ipfs-repo",
   "version": "0.9.1",
   "description": "IPFS Repo implementation",
-  "main": "lib/index.js",
+  "main": "src/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
     "test": "aegir-test",
@@ -67,4 +67,4 @@
     "nginnever <[email protected]>",
     "npmcdn-to-unpkg-bot <[email protected]>"
   ]
-}
+}

src/stores/blockstore.js

@@ -1,23 +1,23 @@
 'use strict'
 
 const Block = require('ipfs-block')
-const pull = require('pull-stream')
 const Lock = require('lock')
 const base32 = require('base32.js')
 const path = require('path')
-const pullWrite = require('pull-write')
 const parallel = require('run-parallel')
+const pull = require('pull-stream')
+const pullWrite = require('pull-write')
 const pullDefer = require('pull-defer/source')
 
 const PREFIX_LENGTH = 5
+const EXTENSION = 'data'
 
 exports = module.exports
 
 function multihashToPath (multihash) {
-  const extension = 'data'
   const encoder = new base32.Encoder()
   const hash = encoder.write(multihash).finalize()
-  const filename = `${hash}.${extension}`
+  const filename = `${hash}.${EXTENSION}`
   const folder = filename.slice(0, PREFIX_LENGTH)
 
   return path.join(folder, filename)
@@ -87,40 +87,31 @@ exports.setUp = (basePath, BlobStore, locks) => {
     },
 
     /*
-     * returns a pull-stream to write blockBlob into
+     * putStream - write multiple blocks
+     *
+     * returns a pull-stream that expects blockBlobs
+     *
      * NOTE: blockBlob is a { data: <>, key: <> } and not a
      * ipfs-block instance. This is because Block instances support
      * several types of hashing and it is up to the BlockService
      * to understand the right one to use (given the CID)
      */
-    // TODO use a more explicit name, given that getStream is just for
-    // one block, multiple blocks should have different naming
+    // TODO
+    // consider using a more explicit name, this can cause some confusion
+    // since the natural association is
+    //   getStream - createReadStream - read one
+    //   putStream - createWriteStream - write one
+    // where in fact it is:
+    //   getStream - createReadStream - read one (the same)
+    //   putStream - createFilesWriteStream = write several
+    //
     putStream () {
       let ended = false
       let written = []
       let push = null
 
       const sink = pullWrite((blockBlobs, cb) => {
-        const tasks = blockBlobs.map((blockBlob) => {
-          return (cb) => {
-            writeBlock(blockBlob, (err, meta) => {
-              if (err) {
-                return cb(err)
-              }
-
-              if (push) {
-                const read = push
-                push = null
-                read(null, meta)
-                return cb()
-              }
-
-              written.push(meta)
-              cb()
-            })
-          }
-        })
-
+        const tasks = writeTasks(blockBlobs)
         parallel(tasks, cb)
       }, null, 100, (err) => {
         ended = err || true
@@ -129,7 +120,6 @@ exports.setUp = (basePath, BlobStore, locks) => {
         }
       })
 
-      // TODO ??Why does a putStream need to be a source as well??
       const source = (end, cb) => {
         if (end) {
           ended = end
@@ -145,7 +135,36 @@ exports.setUp = (basePath, BlobStore, locks) => {
         push = cb
       }
 
-      return { source: source, sink: sink }
+      /*
+       * Creates individual tasks to write each block blob that can be
+       * exectured in parallel
+       */
+      function writeTasks (blockBlobs) {
+        return blockBlobs.map((blockBlob) => {
+          return (cb) => {
+            writeBlock(blockBlob, (err, meta) => {
+              if (err) {
+                return cb(err)
+              }
+
+              if (push) {
+                const read = push
+                push = null
+                read(null, meta)
+                return cb()
+              }
+
+              written.push(meta)
+              cb()
+            })
+          }
+        })
+      }
+
+      return {
+        source: source,
+        sink: sink
+      }
     },
 
     has (key, callback) {