From 2fe87d0bfbff7b16980ea0be4cf7cf7caf83bf80 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 17 May 2016 22:37:03 +0100
Subject: [PATCH] update multiaddr and mafmt to support websockets name change

---
 gulpfile.js     |  2 +-
 package.json    |  6 +++---
 test/browser.js |  6 +++---
 test/node.js    | 14 +++++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index b44a6d5..89103b8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,7 +8,7 @@ let ws
 
 gulp.task('test:browser:before', (done) => {
   ws = new WSlibp2p()
-  const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+  const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
   ws.createListener(mh, (socket) => {
     socket.pipe(socket)
   }, done)
diff --git a/package.json b/package.json
index d44fc8c..a70952f 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,8 @@
   },
   "homepage": "https://github.com/diasdavid/js-libp2p-websockets#readme",
   "dependencies": {
-    "mafmt": "^1.0.1",
-    "multiaddr": "^1.1.1",
+    "mafmt": "^2.0.0",
+    "multiaddr": "^2.0.0",
     "run-parallel": "^1.1.6",
     "simple-websocket": "github:diasdavid/simple-websocket#ec31437"
   },
@@ -52,4 +52,4 @@
     "Francisco Baio Dias <xicombd@gmail.com>",
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/test/browser.js b/test/browser.js
index d78cfec..58567cc 100644
--- a/test/browser.js
+++ b/test/browser.js
@@ -16,7 +16,7 @@ describe('libp2p-websockets', function () {
   })
 
   it('echo', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
     const conn = ws.dial(mh)
     const message = 'Hello World!'
     conn.write(message)
@@ -29,7 +29,7 @@ describe('libp2p-websockets', function () {
 
   describe('stress', () => {
     it('one big write', (done) => {
-      const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+      const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
       const conn = ws.dial(mh)
       const message = new Buffer(1000000).fill('a').toString('hex')
       conn.write(message)
@@ -41,7 +41,7 @@ describe('libp2p-websockets', function () {
     })
 
     it('many writes in 2 batches', (done) => {
-      const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+      const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
       const conn = ws.dial(mh)
       let expected = ''
       let counter = 0
diff --git a/test/node.js b/test/node.js
index cf2cccb..a06dc77 100644
--- a/test/node.js
+++ b/test/node.js
@@ -16,7 +16,7 @@ describe('libp2p-websockets', function () {
   })
 
   it('listen and dial', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
     ws.createListener(mh, (socket) => {
       expect(socket).to.exist
       socket.end()
@@ -28,8 +28,8 @@ describe('libp2p-websockets', function () {
   })
 
   it('listen on several', (done) => {
-    const mh1 = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
-    const mh2 = multiaddr('/ip4/127.0.0.1/tcp/9091/websockets')
+    const mh1 = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
+    const mh2 = multiaddr('/ip4/127.0.0.1/tcp/9091/ws')
     const ws = new WSlibp2p()
 
     ws.createListener([mh1, mh2], (socket) => {}, () => {
@@ -38,7 +38,7 @@ describe('libp2p-websockets', function () {
   })
 
   it('get observed addrs', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
     ws.createListener(mh, (socket) => {
       expect(socket).to.exist
       socket.end()
@@ -53,7 +53,7 @@ describe('libp2p-websockets', function () {
   it('filter', (done) => {
     const mh1 = multiaddr('/ip4/127.0.0.1/tcp/9090')
     const mh2 = multiaddr('/ip4/127.0.0.1/udp/9090')
-    const mh3 = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+    const mh3 = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
 
     const valid = ws.filter([mh1, mh2, mh3])
     expect(valid.length).to.equal(1)
@@ -62,7 +62,7 @@ describe('libp2p-websockets', function () {
   })
 
   it('echo', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
     ws.createListener(mh, (conn) => {
       conn.pipe(conn)
     }, () => {
@@ -78,7 +78,7 @@ describe('libp2p-websockets', function () {
   })
 
   it('echo with connect event and send', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
     ws.createListener(mh, (conn) => {
       conn.pipe(conn)
     }, () => {