From 97cde1ccb41bc513b4b1f9af673432f38f8d4b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 10 Jan 2018 15:53:24 +0100 Subject: [PATCH] test: Various pdd fixes (#150) * fix(pdd): url for interop pkg was pointing to non-existing branch * fix(pdd): case-sensitive names peer-B.json does not _actually_ exist * fix(pdd): story 2 peer b --- pdd/package.json | 2 +- pdd/pdd-transport--story-1--peer-a.js | 2 +- pdd/pdd-transport--story-1--peer-b.js | 2 +- pdd/pdd-transport--story-2--peer-a.js | 2 +- pdd/pdd-transport--story-2--peer-b.js | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pdd/package.json b/pdd/package.json index 252a2983..52b11669 100644 --- a/pdd/package.json +++ b/pdd/package.json @@ -14,7 +14,7 @@ "license": "MIT", "dependencies": { "libp2p": "file:./..", - "libp2p-interop": "github:libp2p/interop#pdd", + "libp2p-interop": "github:libp2p/interop#master", "tape": "^4.8.0" } } diff --git a/pdd/pdd-transport--story-1--peer-a.js b/pdd/pdd-transport--story-1--peer-a.js index 7bb87d93..10e77a7e 100644 --- a/pdd/pdd-transport--story-1--peer-a.js +++ b/pdd/pdd-transport--story-1--peer-a.js @@ -7,7 +7,7 @@ const PeerInfo = require('peer-info') const waterfall = require('async/waterfall') const pull = require('pull-stream') const PeerA = require('libp2p-interop/peer-a.json') -const PeerB = require('libp2p-interop/peer-B.json') +const PeerB = require('libp2p-interop/peer-b.json') class MyBundle extends libp2p { constructor (peerInfo) { diff --git a/pdd/pdd-transport--story-1--peer-b.js b/pdd/pdd-transport--story-1--peer-b.js index b51e49ae..c5089d1b 100644 --- a/pdd/pdd-transport--story-1--peer-b.js +++ b/pdd/pdd-transport--story-1--peer-b.js @@ -6,7 +6,7 @@ const TCP = require('libp2p-tcp') const PeerInfo = require('peer-info') const waterfall = require('async/waterfall') const pull = require('pull-stream') -const PeerB = require('libp2p-interop/peer-B.json') +const PeerB = require('libp2p-interop/peer-b.json') class MyBundle extends libp2p { constructor (peerInfo) { diff --git a/pdd/pdd-transport--story-2--peer-a.js b/pdd/pdd-transport--story-2--peer-a.js index 8fef07c0..7e2014b3 100644 --- a/pdd/pdd-transport--story-2--peer-a.js +++ b/pdd/pdd-transport--story-2--peer-a.js @@ -7,7 +7,7 @@ const PeerInfo = require('peer-info') const waterfall = require('async/waterfall') const pull = require('pull-stream') const PeerA = require('libp2p-interop/peer-a.json') -const PeerB = require('libp2p-interop/peer-B.json') +const PeerB = require('libp2p-interop/peer-b.json') class MyBundle extends libp2p { constructor (peerInfo) { diff --git a/pdd/pdd-transport--story-2--peer-b.js b/pdd/pdd-transport--story-2--peer-b.js index 52597e63..44a9c4af 100644 --- a/pdd/pdd-transport--story-2--peer-b.js +++ b/pdd/pdd-transport--story-2--peer-b.js @@ -6,7 +6,7 @@ const WebSockets = require('libp2p-websockets') const PeerInfo = require('peer-info') const waterfall = require('async/waterfall') const pull = require('pull-stream') -const PeerB = require('libp2p-interop/peer-B.json') +const PeerB = require('libp2p-interop/peer-b.json') class MyBundle extends libp2p { constructor (peerInfo) { @@ -35,14 +35,14 @@ test('story 2 - peerB', (t) => { node.handle('/echo/1.0.0', (protocol, conn) => { pull( conn, - conn, - pull.onEnd((err) => { + pull.through(v => v, err => { t.ifErr(err) t.pass('Received End of Connection') node.stop((err) => { t.ifErr(err, 'PeerB has stopped') }) - }) + }), + conn ) }) })