vendor go-ipfs-util

p2p/crypto/key.go

@@ -24,7 +24,7 @@ import (
 	proto "QmfH4HuZyN1p2wQLWWkXC91Z76435xKrBVfLQ2MY8ayG5R/gogo-protobuf/proto"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
-	u "util"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 )
 
 var log = logging.Logger("crypto")

p2p/crypto/secio/protocol.go

@@ -11,11 +11,11 @@ import (
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 	ci "github.com/ipfs/go-libp2p/p2p/crypto"
 	pb "github.com/ipfs/go-libp2p/p2p/crypto/secio/pb"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	msgio "github.com/jbenet/go-msgio"
-	u "util"
 )
 
 var log = logging.Logger("secio")

p2p/host/basic/natmgr.go

@@ -9,7 +9,7 @@ import (
 
 	inat "github.com/ipfs/go-libp2p/p2p/nat"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 )
 
 // natManager takes care of adding + removing port mappings to the nat.

p2p/host/routed/routed.go

@@ -7,7 +7,7 @@ import (
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 
 	host "github.com/ipfs/go-libp2p/p2p/host"
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"

p2p/net/conn/conn.go

@@ -9,12 +9,12 @@ import (
 	manet "QmRCPT5WRph8aWXmaT2Rfn6ac98YRUUJnNURpD3hNAWp4f/go-multiaddr-net"
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	mpool "github.com/jbenet/go-msgio/mpool"
-	u "util"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 )
 
 var log = logging.Logger("conn")

p2p/net/conn/dial.go

@@ -8,7 +8,7 @@ import (
 	manet "QmRCPT5WRph8aWXmaT2Rfn6ac98YRUUJnNURpD3hNAWp4f/go-multiaddr-net"
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 
 	ci "github.com/ipfs/go-libp2p/p2p/crypto"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"

p2p/net/swarm/swarm_dial.go

@@ -12,7 +12,7 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"

p2p/net/swarm/swarm_listen.go

@@ -7,7 +7,7 @@ import (
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"

p2p/net/transport/tcp.go

@@ -10,7 +10,7 @@ import (
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	reuseport "github.com/jbenet/go-reuseport"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 )
 
 type TcpTransport struct {

p2p/peer/peer.go

@@ -12,8 +12,8 @@ import (
 	mh "QmdsKjp5fcCT8PZ8JBMcdFsCbbmKwSLCU5xXbsnwb5DMxy/go-multihash"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
-	u "util"
 )
 
 var log = logging.Logger("peer")

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"
 	tu "github.com/ipfs/go-libp2p/testutil"
-	u "util"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 
 	b58 "QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58"
 )

p2p/peer/queue/queue_test.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	u "util"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 )

p2p/protocol/identify/id.go

@@ -17,7 +17,7 @@ import (
 	pb "github.com/ipfs/go-libp2p/p2p/protocol/identify/pb"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
-	lgbl "util/eventlog/loggables"
+	lgbl "github.com/ipfs/go-libp2p/loggables"
 )
 
 var log = logging.Logger("net/identify")

p2p/protocol/ping/ping.go

@@ -7,12 +7,12 @@ import (
 	"time"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 	host "github.com/ipfs/go-libp2p/p2p/host"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	u "util"
 )
 
 var log = logging.Logger("ping")

p2p/test/backpressure/backpressure_test.go

@@ -14,7 +14,7 @@ import (
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
-	u "util"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 )
 
 var log = logging.Logger("backpressure")

p2p/test/reconnects/reconnect_test.go

@@ -13,7 +13,7 @@ import (
 	swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
-	u "util"
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 
 	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ps "github.com/jbenet/go-peerstream"

p2p/test/util/key.go

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

package.json

@@ -32,6 +32,11 @@
       "name": "go-notifier",
       "hash": "QmUtEiB6DmXs7eLJiwS9YFyTAtptqzaWutxCsjHy7UKEgo",
       "version": "1.0.0"
+    },
+    {
+      "name": "go-ipfs-util",
+      "hash": "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE",
+      "version": "1.0.0"
     }
   ],
   "language": "go"

testutil/gen.go

@@ -8,9 +8,9 @@ import (
 	"sync"
 	"testing"
 
+	u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util"
 	ci "github.com/ipfs/go-libp2p/p2p/crypto"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	u "util"
 
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 )