From 67e76c0acc63f93fc2b5d83dc96da6683a44b926 Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Sun, 14 Sep 2014 01:42:00 -0700 Subject: [PATCH] godeps multiaddr + swarm move. --- bitswap/bitswap.go | 2 +- core/core.go | 2 +- net/net.go | 2 +- net/swarm/conn.go | 2 +- routing/dht/dht.go | 2 +- routing/dht/dht_test.go | 2 +- routing/dht/ext_test.go | 2 +- routing/dht/routing.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bitswap/bitswap.go b/bitswap/bitswap.go index bcb16b747..37876fc95 100644 --- a/bitswap/bitswap.go +++ b/bitswap/bitswap.go @@ -7,10 +7,10 @@ import ( ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" blocks "github.com/jbenet/go-ipfs/blocks" + swarm "github.com/jbenet/go-ipfs/net/swarm" peer "github.com/jbenet/go-ipfs/peer" routing "github.com/jbenet/go-ipfs/routing" dht "github.com/jbenet/go-ipfs/routing/dht" - swarm "github.com/jbenet/go-ipfs/swarm" u "github.com/jbenet/go-ipfs/util" ) diff --git a/core/core.go b/core/core.go index 3ddb45245..1dacafc0a 100644 --- a/core/core.go +++ b/core/core.go @@ -13,11 +13,11 @@ import ( config "github.com/jbenet/go-ipfs/config" ci "github.com/jbenet/go-ipfs/crypto" merkledag "github.com/jbenet/go-ipfs/merkledag" + swarm "github.com/jbenet/go-ipfs/net/swarm" path "github.com/jbenet/go-ipfs/path" peer "github.com/jbenet/go-ipfs/peer" routing "github.com/jbenet/go-ipfs/routing" dht "github.com/jbenet/go-ipfs/routing/dht" - swarm "github.com/jbenet/go-ipfs/swarm" u "github.com/jbenet/go-ipfs/util" ) diff --git a/net/net.go b/net/net.go index 2895c38f9..a6361d9b6 100644 --- a/net/net.go +++ b/net/net.go @@ -8,7 +8,7 @@ import ( swarm "github.com/jbenet/go-ipfs/net/swarm" peer "github.com/jbenet/go-ipfs/peer" - context "code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ) // IpfsNetwork implements the Network interface, diff --git a/net/swarm/conn.go b/net/swarm/conn.go index 4bcd1129e..db4bab74b 100644 --- a/net/swarm/conn.go +++ b/net/swarm/conn.go @@ -10,7 +10,7 @@ import ( msg "github.com/jbenet/go-ipfs/net/message" u "github.com/jbenet/go-ipfs/util" - ma "github.com/jbenet/go-multiaddr" + ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ) // Open listeners for each network the swarm should listen on diff --git a/routing/dht/dht.go b/routing/dht/dht.go index 074815a18..d78c78b54 100644 --- a/routing/dht/dht.go +++ b/routing/dht/dht.go @@ -7,9 +7,9 @@ import ( "sync" "time" + swarm "github.com/jbenet/go-ipfs/net/swarm" peer "github.com/jbenet/go-ipfs/peer" kb "github.com/jbenet/go-ipfs/routing/kbucket" - swarm "github.com/jbenet/go-ipfs/swarm" u "github.com/jbenet/go-ipfs/util" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" diff --git a/routing/dht/dht_test.go b/routing/dht/dht_test.go index 86dace2cc..24d4d4461 100644 --- a/routing/dht/dht_test.go +++ b/routing/dht/dht_test.go @@ -7,8 +7,8 @@ import ( ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ci "github.com/jbenet/go-ipfs/crypto" identify "github.com/jbenet/go-ipfs/identify" + swarm "github.com/jbenet/go-ipfs/net/swarm" peer "github.com/jbenet/go-ipfs/peer" - swarm "github.com/jbenet/go-ipfs/swarm" u "github.com/jbenet/go-ipfs/util" "bytes" diff --git a/routing/dht/ext_test.go b/routing/dht/ext_test.go index 82337bfa6..fe98443ad 100644 --- a/routing/dht/ext_test.go +++ b/routing/dht/ext_test.go @@ -9,8 +9,8 @@ import ( ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + swarm "github.com/jbenet/go-ipfs/net/swarm" peer "github.com/jbenet/go-ipfs/peer" - swarm "github.com/jbenet/go-ipfs/swarm" u "github.com/jbenet/go-ipfs/util" "time" diff --git a/routing/dht/routing.go b/routing/dht/routing.go index 383c64a98..3b8b25f5c 100644 --- a/routing/dht/routing.go +++ b/routing/dht/routing.go @@ -10,9 +10,9 @@ import ( ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + swarm "github.com/jbenet/go-ipfs/net/swarm" peer "github.com/jbenet/go-ipfs/peer" kb "github.com/jbenet/go-ipfs/routing/kbucket" - swarm "github.com/jbenet/go-ipfs/swarm" u "github.com/jbenet/go-ipfs/util" )