Revert "chore: Update to latest multiaddr (p2p by default over ipfs) (#43)"

This reverts commit bbd2c1ddc01a68ed330248fd101383710d64578e.

.travis.yml

@@ -6,7 +6,6 @@ stages:
   - cov
 
 node_js:
-  - '12'
   - '10'
 
 os:
@@ -21,6 +20,7 @@ jobs:
   include:
     - stage: check
       script:
+        - npx aegir commitlint --travis
         - npx aegir dep-check -- -i wrtc -i electron-webrtc
         - npm run lint
 

package.json

@@ -17,7 +17,8 @@
     "coverage-publish": "aegir coverage publish"
   },
   "pre-push": [
-    "lint"
+    "lint",
+    "test"
   ],
   "repository": "github:multiformats/js-mafmt",
   "keywords": [
@@ -31,7 +32,7 @@
     "chai": "^4.2.0"
   },
   "dependencies": {
-    "multiaddr": "^7.0.0"
+    "multiaddr": "^6.1.0"
   },
   "contributors": [
     "Alan Shaw <alan@tableflip.io>",

src/index.js

@@ -45,11 +45,15 @@ const HTTPS = or(
 )
 
 const WebRTCStar = or(
+  and(WebSockets, base('p2p-webrtc-star'), base('ipfs')),
+  and(WebSocketsSecure, base('p2p-webrtc-star'), base('ipfs')),
   and(WebSockets, base('p2p-webrtc-star'), base('p2p')),
   and(WebSocketsSecure, base('p2p-webrtc-star'), base('p2p'))
 )
 
 const WebSocketStar = or(
+  and(WebSockets, base('p2p-websocket-star'), base('ipfs')),
+  and(WebSocketsSecure, base('p2p-websocket-star'), base('ipfs')),
   and(WebSockets, base('p2p-websocket-star'), base('p2p')),
   and(WebSocketsSecure, base('p2p-websocket-star'), base('p2p')),
   and(WebSockets, base('p2p-websocket-star')),
@@ -74,13 +78,15 @@ const Reliable = or(
 
 // Unlike ws-star, stardust can run over any transport thus removing the requirement for websockets (but don't even think about running a stardust server over webrtc-star ;) )
 const Stardust = or(
-  and(Reliable, base('p2p-stardust'), base('p2p')),
+  and(Reliable, base('p2p-stardust'), base('ipfs')),
   and(Reliable, base('p2p-stardust'))
 )
 
 const _P2P = or(
+  and(Reliable, base('ipfs')),
   and(Reliable, base('p2p')),
   WebRTCStar,
+  base('ipfs'),
   base('p2p')
 )
 

test/index.spec.js

@@ -164,8 +164,6 @@ describe('multiaddr validation', function () {
     '/ip4/127.0.0.1/tcp/20008/ws/p2p/QmUjNmr8TgJCn1Ao7DvMy4cjoZU15b9bwSCBLE3vwXiwgj',
     '/ip4/1.2.3.4/tcp/3456/ws/p2p-webrtc-star/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4',
     '/ip4/1.2.3.4/tcp/3456/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4',
-    '/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4',
-    '/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4',
     '/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4/p2p-circuit',
     '/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4/p2p-circuit/p2p/QmUjNmr8TgJCn1Ao7DvMy4cjoZU15b9bwSCBLE3vwXiwgj'
   ].concat(goodCircuit)