diff options
| author | cel <cel@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519> | 2017-06-14 11:03:59 -1000 |
|---|---|---|
| committer | cel <cel@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519> | 2017-06-14 11:09:17 -1000 |
| commit | 7fe3cad4b29b4cac33766b12b9e49fbcf38bec25 (patch) | |
| tree | a140e23dee4b1337e53f9f9392d8dc78b806d021 | |
| parent | 47dda2fa1ff7e9e2cc281278bf33e79e46a38873 (diff) | |
| download | patchfoo-7fe3cad4b29b4cac33766b12b9e49fbcf38bec25.tar.gz patchfoo-7fe3cad4b29b4cac33766b12b9e49fbcf38bec25.zip | |
Move blobs.add hack into ssb-party
Requires ssb-party v0.5.0: %JUEZmqElq3NF0kRnJ9c4dwhWi6sNEOfXeYVSTKK4BeM=.sha256
Running patchfoo as a scuttlebot plugin should be unaffected, because the hack
is not needed in that case.
| -rw-r--r-- | lib/app.js | 12 | ||||
| -rw-r--r-- | package.json | 3 |
2 files changed, 2 insertions, 13 deletions
@@ -4,7 +4,6 @@ var lru = require('hashlru') var pkg = require('../package') var u = require('./util') var pull = require('pull-stream') -var hasher = require('pull-hash/ext/ssb') var multicb = require('multicb') var paramap = require('pull-paramap') var Contacts = require('ssb-contact') @@ -184,16 +183,7 @@ App.prototype.wantSizeBlob = function (id, cb) { } App.prototype.addBlob = function (cb) { - var done = multicb({pluck: 1, spread: true}) - var hashCb = done() - var addCb = done() - done(function (err, hash, add) { - cb(err, hash) - }) - return pull( - hasher(hashCb), - this.sbot.blobs.add(addCb) - ) + return this.sbot.blobs.add(cb) } App.prototype.pushBlob = function (id, cb) { diff --git a/package.json b/package.json index 790fa74..b4260f4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "multicb": "^1.2.1", "pull-cat": "^1.1.11", "pull-git-packidx-parser": "^1.0.0", - "pull-hash": "^1.0.0", "pull-hyperscript": "^0.2.2", "pull-identify-filetype": "^1.1.0", "pull-kvdiff": "^0.0.1", @@ -27,7 +26,7 @@ "ssb-contact": "^1.0.0", "ssb-marked": "^0.7.1", "ssb-mentions": "^0.4.0", - "ssb-party": "^0.4.0", + "ssb-party": "^0.5.0", "ssb-sort": "^1.0.0", "stream-to-pull-stream": "^1.7.2" }, |