Async Crypto Endeavour

package.json

@@ -2,7 +2,7 @@
   "name": "interface-ipfs-core",
   "version": "0.15.0",
   "description": "A test suite and interface you can use to implement a IPFS core interface.",
-  "main": "lib/index.js",
+  "main": "src/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
     "test": "exit(0)",
@@ -28,6 +28,7 @@
   },
   "homepage": "https://github.com/ipfs/interface-ipfs-core#readme",
   "dependencies": {
+    "async": "^2.0.1",
     "bl": "^1.1.2",
     "bs58": "^3.0.0",
     "chai": "^3.5.0",
@@ -36,6 +37,7 @@
     "ipfs-block": "^0.3.0",
     "ipfs-merkle-dag": "^0.7.0",
     "multihashes": "^0.2.2",
+    "promisify-es6": "^1.0.2",
     "readable-stream": "1.1.13",
     "run-series": "^1.1.4"
   },
@@ -51,4 +53,4 @@
     "greenkeeperio-bot <support@greenkeeper.io>",
     "nginnever <ginneversource@gmail.com>"
   ]
-}
+}

src/block.js

@@ -46,13 +46,14 @@ module.exports = (common) => {
 
       it('.put a block', (done) => {
         const expectedHash = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
-        const blob = new Block(new Buffer('blorb'))
-
-        ipfs.block.put(blob, (err, block) => {
+        Block.create(new Buffer('blorb'), (err, blob) => {
           expect(err).to.not.exist
-          expect(block.key).to.eql(multihash.fromB58String(expectedHash))
-          expect(block.data).to.eql(new Buffer('blorb'))
-          done()
+          ipfs.block.put(blob, (err, block) => {
+            expect(err).to.not.exist
+            expect(block.key).to.eql(multihash.fromB58String(expectedHash))
+            expect(block.data).to.eql(new Buffer('blorb'))
+            done()
+          })
         })
       })
 

src/files.js

@@ -436,10 +436,9 @@ module.exports = (common) => {
             })
         })
 
-        it('errors on invalid key', (done) => {
+        it('errors on invalid key', () => {
           const hash = 'somethingNotMultihash'
-          ipfs.files.get(hash)
-            .then((stream) => {})
+          return ipfs.files.get(hash)
             .catch((err) => {
               expect(err).to.exist
               const errString = err.toString()
@@ -449,7 +448,6 @@ module.exports = (common) => {
               if (errString === 'Error: Invalid Key') {
                 expect(err.toString()).to.contain('Error: Invalid Key')
               }
-              done()
             })
         })
       })