From 14db530090f308bd5dd80ba726a636ee62a96ea8 Mon Sep 17 00:00:00 2001 From: dmitriy ryajov Date: Sun, 26 Feb 2017 00:07:33 -0800 Subject: [PATCH] fix: p2p-circuit validation --- src/index.js | 2 ++ test/index.spec.js | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index daf5f5a..d43baed 100644 --- a/src/index.js +++ b/src/index.js @@ -66,6 +66,8 @@ const Circuit = or( const IPFS = or( and(_IPFS, Circuit), + and(Circuit, _IPFS), + Circuit, _IPFS ) diff --git a/test/index.spec.js b/test/index.spec.js index 9fa206c..3c61058 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -97,7 +97,9 @@ describe('multiaddr validation', function () { '/p2p-circuit/ipfs/QmUjNmr8TgJCn1Ao7DvMy4cjoZU15b9bwSCBLE3vwXiwgj', '/p2p-circuit/ip4/127.0.0.1/tcp/20008/ws/ipfs/QmUjNmr8TgJCn1Ao7DvMy4cjoZU15b9bwSCBLE3vwXiwgj', '/p2p-circuit/libp2p-webrtc-star/ip4/1.2.3.4/tcp/3456/ws/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4', - '/p2p-circuit/ip4/1.2.3.4/tcp/3456/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4' + '/p2p-circuit/ip4/1.2.3.4/tcp/3456/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4', + '/p2p-circuit/ip4/127.0.0.1/tcp/4002/ipfs/QmddWMcQX6orJGHpETYMyPgXrCXCtYANMFVDCvhKoDwLqA', + '/p2p-circuit/ipfs/QmddWMcQX6orJGHpETYMyPgXrCXCtYANMFVDCvhKoDwLqA' ] const goodIPFS = [ @@ -106,9 +108,7 @@ describe('multiaddr validation', function () { '/ip4/1.2.3.4/tcp/3456/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4', '/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4/p2p-circuit', '/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4/p2p-circuit/ipfs/QmUjNmr8TgJCn1Ao7DvMy4cjoZU15b9bwSCBLE3vwXiwgj' - ] - - goodIPFS.concat(goodCircuit) + ].concat(goodCircuit) function assertMatches (p) { const tests = Array.from(arguments).slice(1)