move testutil up

p2p/crypto/key_test.go

@@ -4,7 +4,7 @@ import (
 	. "github.com/ipfs/go-libp2p/p2p/crypto"
 
 	"bytes"
-	tu "util/testutil"
+	tu "github.com/ipfs/go-libp2p/testutil"
 	"testing"
 )
 

p2p/net/conn/conn_test.go

@@ -10,7 +10,7 @@ import (
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	msgio "github.com/jbenet/go-msgio"
-	travis "util/testutil/ci/travis"
+	travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
 )
 
 func msgioWrap(c Conn) msgio.ReadWriter {

p2p/net/conn/dial_test.go

@@ -11,7 +11,7 @@ import (
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	tu "util/testutil"
+	tu "github.com/ipfs/go-libp2p/testutil"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"

p2p/net/conn/secure_conn_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
-	travis "util/testutil/ci/travis"
+	travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 )

p2p/net/mock/mock_net.go

@@ -11,7 +11,7 @@ import (
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
-	testutil "util/testutil"
+	testutil "github.com/ipfs/go-libp2p/testutil"
 
 	"QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
 	goprocessctx "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess/context"

p2p/net/mock/mock_test.go

@@ -12,7 +12,7 @@ import (
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	testutil "util/testutil"
+	testutil "github.com/ipfs/go-libp2p/testutil"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	detectrace "github.com/jbenet/go-detect-race"

p2p/net/swarm/dial_test.go

@@ -10,8 +10,8 @@ import (
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	testutil "util/testutil"
-	ci "util/testutil/ci"
+	testutil "github.com/ipfs/go-libp2p/testutil"
+	ci "github.com/ipfs/go-libp2p/testutil/ci"
 
 	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"

p2p/net/swarm/simul_test.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	ci "util/testutil/ci"
+	ci "github.com/ipfs/go-libp2p/testutil/ci"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"

p2p/net/swarm/swarm_addr_test.go

@@ -6,7 +6,7 @@ import (
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	testutil "util/testutil"
+	testutil "github.com/ipfs/go-libp2p/testutil"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"

p2p/net/swarm/swarm_test.go

@@ -12,7 +12,7 @@ import (
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	testutil "util/testutil"
+	testutil "github.com/ipfs/go-libp2p/testutil"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"

p2p/peer/metrics_test.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	testutil "util/testutil"
+	testutil "github.com/ipfs/go-libp2p/testutil"
 )
 
 func TestLatencyEWMAFun(t *testing.T) {

p2p/peer/peer_test.go

@@ -9,7 +9,7 @@ import (
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	. "github.com/ipfs/go-libp2p/p2p/peer"
 	u "util"
-	tu "util/testutil"
+	tu "github.com/ipfs/go-libp2p/testutil"
 
 	b58 "QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58"
 )

p2p/test/util/key.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
+	testutil "github.com/ipfs/go-libp2p/testutil"
 	u "util"
-	testutil "util/testutil"
 
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"

p2p/test/util/util.go

@@ -8,7 +8,7 @@ import (
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	tu "util/testutil"
+	tu "github.com/ipfs/go-libp2p/testutil"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"

vendor/util/testutil/ci/ci.go → testutil/ci/ci.go

@@ -6,8 +6,8 @@ package ci
 import (
 	"os"
 
-	jenkins "util/testutil/ci/jenkins"
-	travis "util/testutil/ci/travis"
+	jenkins "github.com/ipfs/go-libp2p/testutil/ci/jenkins"
+	travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
 )
 
 // EnvVar is a type to use travis-only env var names with