From 639e4e1e92fb6e3b61b16c2d1164b2042544c466 Mon Sep 17 00:00:00 2001
From: Jeromy <why@ipfs.io>
Date: Tue, 4 Oct 2016 18:38:14 -0700
Subject: [PATCH] gx publish 1.3.0

---
 .gx/lastpubver        |  2 +-
 addr/addrsrcs.go      |  2 +-
 addr/addrsrcs_test.go |  2 +-
 addr/sorting.go       |  4 ++--
 addr_manager.go       |  4 ++--
 addr_manager_test.go  |  4 ++--
 metrics.go            |  2 +-
 metrics_test.go       |  2 +-
 package.json          | 27 ++++++++++++++-------------
 peerinfo.go           |  4 ++--
 peerinfo_test.go      |  5 +++--
 peerstore.go          |  6 +++---
 peerstore_test.go     |  4 ++--
 queue/distance.go     |  2 +-
 queue/interface.go    |  2 +-
 queue/queue_test.go   |  2 +-
 queue/sync.go         |  2 +-
 test/utils.go         |  4 ++--
 18 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/.gx/lastpubver b/.gx/lastpubver
index ce507d1..503bf0d 100644
--- a/.gx/lastpubver
+++ b/.gx/lastpubver
@@ -1 +1 @@
-1.2.5: QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD
+1.3.0: QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo
diff --git a/addr/addrsrcs.go b/addr/addrsrcs.go
index a172373..9be78d5 100644
--- a/addr/addrsrcs.go
+++ b/addr/addrsrcs.go
@@ -2,7 +2,7 @@
 package addr
 
 import (
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // AddrSource is a source of addresses. It allows clients to retrieve
diff --git a/addr/addrsrcs_test.go b/addr/addrsrcs_test.go
index 4614064..06bea07 100644
--- a/addr/addrsrcs_test.go
+++ b/addr/addrsrcs_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func newAddrOrFatal(t *testing.T, s string) ma.Multiaddr {
diff --git a/addr/sorting.go b/addr/sorting.go
index 084722a..f8a8915 100644
--- a/addr/sorting.go
+++ b/addr/sorting.go
@@ -3,8 +3,8 @@ package addr
 import (
 	"bytes"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 	mafmt "github.com/whyrusleeping/mafmt"
 )
 
diff --git a/addr_manager.go b/addr_manager.go
index 303e8e0..a676f44 100644
--- a/addr_manager.go
+++ b/addr_manager.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	ma "github.com/jbenet/go-multiaddr"
+	peer "github.com/libp2p/go-libp2p-peer"
 	addr "github.com/libp2p/go-libp2p-peerstore/addr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 const (
diff --git a/addr_manager_test.go b/addr_manager_test.go
index 04a2a97..b9cbfd9 100644
--- a/addr_manager_test.go
+++ b/addr_manager_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/go-libp2p-peer"
-	ma "github.com/jbenet/go-multiaddr"
+	"github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func IDS(t *testing.T, ids string) peer.ID {
diff --git a/metrics.go b/metrics.go
index 94b0acc..05b8676 100644
--- a/metrics.go
+++ b/metrics.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ipfs/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-peer"
 )
 
 // LatencyEWMASmooting governs the decay of the EWMA (the speed
diff --git a/metrics_test.go b/metrics_test.go
index 110b6cf..94a7411 100644
--- a/metrics_test.go
+++ b/metrics_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	testutil "github.com/ipfs/go-libp2p-peer/test"
+	testutil "github.com/libp2p/go-libp2p-peer/test"
 )
 
 func TestLatencyEWMAFun(t *testing.T) {
diff --git a/package.json b/package.json
index 7ae0f3b..c636f29 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,9 @@
   "gxDependencies": [
     {
       "author": "whyrusleeping",
-      "hash": "QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1",
+      "hash": "Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr",
       "name": "go-ipfs-util",
-      "version": "1.0.0"
+      "version": "1.2.0"
     },
     {
       "author": "whyrusleeping",
@@ -21,9 +21,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd",
+      "hash": "QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH",
       "name": "go-multiaddr",
-      "version": "0.0.0"
+      "version": "1.1.2"
     },
     {
       "author": "whyrusleeping",
@@ -33,33 +33,34 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ",
+      "hash": "QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46",
       "name": "go-libp2p-crypto",
-      "version": "1.0.4"
+      "version": "1.3.1"
     },
     {
       "author": "jbenet",
-      "hash": "QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff",
+      "hash": "QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp",
       "name": "go-multiaddr-net",
-      "version": "1.3.0"
+      "version": "1.5.1"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmeLQ13LftT9XhNn22piZc3GP56fGqhijuL5Y8KdUaRn1g",
+      "hash": "QmQkdkvXE4oKXAcLZK5d7Zc6xvyukQc8WVjX7QvxDJ7hJj",
       "name": "mafmt",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p",
+      "hash": "QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC",
       "name": "go-libp2p-peer",
-      "version": "2.0.4"
+      "version": "2.1.0"
     }
   ],
   "gxVersion": "0.4.0",
   "language": "go",
   "license": "MIT",
   "name": "go-libp2p-peerstore",
-  "version": "1.2.5"
+  "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
+  "version": "1.3.0"
 }
 
diff --git a/peerinfo.go b/peerinfo.go
index 584d363..a42d5ef 100644
--- a/peerinfo.go
+++ b/peerinfo.go
@@ -3,8 +3,8 @@ package peerstore
 import (
 	"encoding/json"
 
-	"github.com/ipfs/go-libp2p-peer"
-	ma "github.com/jbenet/go-multiaddr"
+	"github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // PeerInfo is a small struct used to pass around a peer with
diff --git a/peerinfo_test.go b/peerinfo_test.go
index b78a662..ca73430 100644
--- a/peerinfo_test.go
+++ b/peerinfo_test.go
@@ -1,9 +1,10 @@
 package peerstore
 
 import (
-	peer "github.com/ipfs/go-libp2p-peer"
-	ma "github.com/jbenet/go-multiaddr"
 	"testing"
+
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func mustAddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/peerstore.go b/peerstore.go
index e26c0ad..98cc460 100644
--- a/peerstore.go
+++ b/peerstore.go
@@ -7,13 +7,13 @@ import (
 	"sync"
 	"time"
 
-	ic "github.com/ipfs/go-libp2p-crypto"
+	ic "github.com/libp2p/go-libp2p-crypto"
 
 	//ds "github.com/jbenet/go-datastore"
 	//dssync "github.com/jbenet/go-datastore/sync"
-	"github.com/ipfs/go-libp2p-peer"
 	logging "github.com/ipfs/go-log"
-	ma "github.com/jbenet/go-multiaddr"
+	"github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 var log = logging.Logger("peerstore")
diff --git a/peerstore_test.go b/peerstore_test.go
index a1a3096..29cf6fa 100644
--- a/peerstore_test.go
+++ b/peerstore_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	ma "github.com/jbenet/go-multiaddr"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func getAddrs(t *testing.T, n int) []ma.Multiaddr {
diff --git a/queue/distance.go b/queue/distance.go
index 7249c79..f89e8d4 100644
--- a/queue/distance.go
+++ b/queue/distance.go
@@ -5,7 +5,7 @@ import (
 	"math/big"
 	"sync"
 
-	peer "github.com/ipfs/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
 	ks "github.com/whyrusleeping/go-keyspace"
 )
 
diff --git a/queue/interface.go b/queue/interface.go
index 352d807..eab523a 100644
--- a/queue/interface.go
+++ b/queue/interface.go
@@ -1,6 +1,6 @@
 package queue
 
-import peer "github.com/ipfs/go-libp2p-peer"
+import peer "github.com/libp2p/go-libp2p-peer"
 
 // PeerQueue maintains a set of peers ordered according to a metric.
 // Implementations of PeerQueue could order peers based on distances along
diff --git a/queue/queue_test.go b/queue/queue_test.go
index 94c24e3..cd3c80d 100644
--- a/queue/queue_test.go
+++ b/queue/queue_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	u "github.com/ipfs/go-ipfs-util"
-	peer "github.com/ipfs/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 func TestQueue(t *testing.T) {
diff --git a/queue/sync.go b/queue/sync.go
index 8ceedce..a1edc2c 100644
--- a/queue/sync.go
+++ b/queue/sync.go
@@ -3,8 +3,8 @@ package queue
 import (
 	"context"
 
-	peer "github.com/ipfs/go-libp2p-peer"
 	logging "github.com/ipfs/go-log"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 var log = logging.Logger("peerqueue")
diff --git a/test/utils.go b/test/utils.go
index c9ee61c..6c4f0be 100644
--- a/test/utils.go
+++ b/test/utils.go
@@ -4,8 +4,8 @@ import (
 	"io"
 
 	u "github.com/ipfs/go-ipfs-util"
-	ci "github.com/ipfs/go-libp2p-crypto"
-	peer "github.com/ipfs/go-libp2p-peer"
+	ci "github.com/libp2p/go-libp2p-crypto"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 func RandPeerID() (peer.ID, error) {