net -> p2p/net
The net package is the next to move. It will be massaged a bit still to fix the Network / "NetworkBackend" conflict.
Juan Batiz-Benet committed
Dec 29, 2014 at 05:48 UTC
e2698a87336660cc52f7abcddc2130095306e3c0
64 files changed
+65
-65
core/bootstrap.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"time"
9
10
config "github.com/jbenet/go-ipfs/config"
11
- inet "github.com/jbenet/go-ipfs/net"
11
+ inet "github.com/jbenet/go-ipfs/p2p/net"
12
peer "github.com/jbenet/go-ipfs/p2p/peer"
13
dht "github.com/jbenet/go-ipfs/routing/dht"
14
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
core/core.go
+2
-2
@@ -19,9 +19,9 @@ import (
19
mount "github.com/jbenet/go-ipfs/fuse/mount"
20
merkledag "github.com/jbenet/go-ipfs/merkledag"
21
namesys "github.com/jbenet/go-ipfs/namesys"
22
- inet "github.com/jbenet/go-ipfs/net"
23
- swarmnet "github.com/jbenet/go-ipfs/net/swarmnet"
22
ic "github.com/jbenet/go-ipfs/p2p/crypto"
23
+ inet "github.com/jbenet/go-ipfs/p2p/net"
24
+ swarmnet "github.com/jbenet/go-ipfs/p2p/net/swarmnet"
25
peer "github.com/jbenet/go-ipfs/p2p/peer"
26
path "github.com/jbenet/go-ipfs/path"
27
pin "github.com/jbenet/go-ipfs/pin"
core/mock.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"github.com/jbenet/go-ipfs/exchange/offline"
11
mdag "github.com/jbenet/go-ipfs/merkledag"
12
nsys "github.com/jbenet/go-ipfs/namesys"
13
- "github.com/jbenet/go-ipfs/net/mock"
13
ci "github.com/jbenet/go-ipfs/p2p/crypto"
14
+ "github.com/jbenet/go-ipfs/p2p/net/mock"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
path "github.com/jbenet/go-ipfs/path"
17
dht "github.com/jbenet/go-ipfs/routing/dht"
diagnostics/diag.go
+1
-1
@@ -18,7 +18,7 @@ import (
18
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
19
20
pb "github.com/jbenet/go-ipfs/diagnostics/internal/pb"
21
- net "github.com/jbenet/go-ipfs/net"
21
+ net "github.com/jbenet/go-ipfs/p2p/net"
22
peer "github.com/jbenet/go-ipfs/p2p/peer"
23
util "github.com/jbenet/go-ipfs/util"
24
)
epictest/addcat_test.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
12
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
14
- mocknet "github.com/jbenet/go-ipfs/net/mock"
14
+ mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
15
errors "github.com/jbenet/go-ipfs/util/debugerror"
16
)
17
epictest/core.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
importer "github.com/jbenet/go-ipfs/importer"
16
chunk "github.com/jbenet/go-ipfs/importer/chunk"
17
merkledag "github.com/jbenet/go-ipfs/merkledag"
18
- net "github.com/jbenet/go-ipfs/net"
18
+ net "github.com/jbenet/go-ipfs/p2p/net"
19
peer "github.com/jbenet/go-ipfs/p2p/peer"
20
path "github.com/jbenet/go-ipfs/path"
21
dht "github.com/jbenet/go-ipfs/routing/dht"
epictest/three_legged_cat_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"testing"
8
9
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
- mocknet "github.com/jbenet/go-ipfs/net/mock"
10
+ mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
11
errors "github.com/jbenet/go-ipfs/util/debugerror"
12
)
13
exchange/bitswap/message/message.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
blocks "github.com/jbenet/go-ipfs/blocks"
7
pb "github.com/jbenet/go-ipfs/exchange/bitswap/message/internal/pb"
8
wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
9
- inet "github.com/jbenet/go-ipfs/net"
9
+ inet "github.com/jbenet/go-ipfs/p2p/net"
10
u "github.com/jbenet/go-ipfs/util"
11
12
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
exchange/bitswap/network/ipfs_impl.go
+1
-1
@@ -3,7 +3,7 @@ package network
3
import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
6
- inet "github.com/jbenet/go-ipfs/net"
6
+ inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
routing "github.com/jbenet/go-ipfs/routing"
9
util "github.com/jbenet/go-ipfs/util"
exchange/bitswap/testnet/peernet.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
6
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
7
- mockpeernet "github.com/jbenet/go-ipfs/net/mock"
7
+ mockpeernet "github.com/jbenet/go-ipfs/p2p/net/mock"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
10
testutil "github.com/jbenet/go-ipfs/util/testutil"
p2p/net/README.md
renamed
p2p/net/backpressure/backpressure.go
renamed
p2p/net/backpressure/backpressure_test.go
renamed
+2
-2
@@ -7,8 +7,8 @@ import (
7
"testing"
8
"time"
9
10
- inet "github.com/jbenet/go-ipfs/net"
11
- netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
10
+ inet "github.com/jbenet/go-ipfs/p2p/net"
11
+ netutil "github.com/jbenet/go-ipfs/p2p/net/swarmnet/util"
12
peer "github.com/jbenet/go-ipfs/p2p/peer"
13
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
14
p2p/net/conn/conn.go
renamed
p2p/net/conn/conn_test.go
renamed
p2p/net/conn/dial.go
renamed
p2p/net/conn/dial_test.go
renamed
p2p/net/conn/handshake.go
renamed
+2
-2
@@ -3,8 +3,8 @@ package conn
3
import (
4
"fmt"
5
6
- handshake "github.com/jbenet/go-ipfs/net/handshake"
7
- hspb "github.com/jbenet/go-ipfs/net/handshake/pb"
6
+ handshake "github.com/jbenet/go-ipfs/p2p/net/handshake"
7
+ hspb "github.com/jbenet/go-ipfs/p2p/net/handshake/pb"
8
9
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
ggprotoio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
p2p/net/conn/interface.go
renamed
p2p/net/conn/listen.go
renamed
p2p/net/conn/secure_conn.go
renamed
p2p/net/conn/secure_conn_test.go
renamed
p2p/net/handshake/README.md
renamed
p2p/net/handshake/doc.go
renamed
p2p/net/handshake/handshake1.go
renamed
+1
-1
@@ -5,7 +5,7 @@ import (
5
"fmt"
6
7
config "github.com/jbenet/go-ipfs/config"
8
- pb "github.com/jbenet/go-ipfs/net/handshake/pb"
8
+ pb "github.com/jbenet/go-ipfs/p2p/net/handshake/pb"
9
u "github.com/jbenet/go-ipfs/util"
10
11
semver "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
p2p/net/handshake/handshake1_test.go
renamed
p2p/net/handshake/pb/Makefile
renamed
p2p/net/handshake/pb/handshake.pb.go
renamed
p2p/net/handshake/pb/handshake.proto
renamed
p2p/net/interface.go
renamed
+2
-2
@@ -3,8 +3,8 @@ package net
3
import (
4
"io"
5
6
- conn "github.com/jbenet/go-ipfs/net/conn"
7
- // swarm "github.com/jbenet/go-ipfs/net/swarm2"
6
+ conn "github.com/jbenet/go-ipfs/p2p/net/conn"
7
+ // swarm "github.com/jbenet/go-ipfs/p2p/net/swarm2"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/net/mock/interface.go
renamed
+1
-1
@@ -10,8 +10,8 @@ import (
10
"io"
11
"time"
12
13
- inet "github.com/jbenet/go-ipfs/net"
13
ic "github.com/jbenet/go-ipfs/p2p/crypto"
14
+ inet "github.com/jbenet/go-ipfs/p2p/net"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
17
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
p2p/net/mock/mock.go
renamed
p2p/net/mock/mock_conn.go
renamed
+2
-2
@@ -4,9 +4,9 @@ import (
4
"container/list"
5
"sync"
6
7
- inet "github.com/jbenet/go-ipfs/net"
8
- mux "github.com/jbenet/go-ipfs/net/services/mux"
7
ic "github.com/jbenet/go-ipfs/p2p/crypto"
8
+ inet "github.com/jbenet/go-ipfs/p2p/net"
9
+ mux "github.com/jbenet/go-ipfs/p2p/net/services/mux"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
12
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
p2p/net/mock/mock_link.go
renamed
+1
-1
@@ -4,7 +4,7 @@ import (
4
"io"
5
"sync"
6
7
- inet "github.com/jbenet/go-ipfs/net"
7
+ inet "github.com/jbenet/go-ipfs/p2p/net"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
)
10
p2p/net/mock/mock_net.go
renamed
+1
-1
@@ -4,8 +4,8 @@ import (
4
"fmt"
5
"sync"
6
7
- inet "github.com/jbenet/go-ipfs/net"
7
ic "github.com/jbenet/go-ipfs/p2p/crypto"
8
+ inet "github.com/jbenet/go-ipfs/p2p/net"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
testutil "github.com/jbenet/go-ipfs/util/testutil"
11
p2p/net/mock/mock_peernet.go
renamed
+4
-4
@@ -5,11 +5,11 @@ import (
5
"math/rand"
6
"sync"
7
8
- inet "github.com/jbenet/go-ipfs/net"
9
- ids "github.com/jbenet/go-ipfs/net/services/identify"
10
- mux "github.com/jbenet/go-ipfs/net/services/mux"
11
- relay "github.com/jbenet/go-ipfs/net/services/relay"
8
ic "github.com/jbenet/go-ipfs/p2p/crypto"
9
+ inet "github.com/jbenet/go-ipfs/p2p/net"
10
+ ids "github.com/jbenet/go-ipfs/p2p/net/services/identify"
11
+ mux "github.com/jbenet/go-ipfs/p2p/net/services/mux"
12
+ relay "github.com/jbenet/go-ipfs/p2p/net/services/relay"
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
15
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/net/mock/mock_printer.go
renamed
+1
-1
@@ -4,7 +4,7 @@ import (
4
"fmt"
5
"io"
6
7
- inet "github.com/jbenet/go-ipfs/net"
7
+ inet "github.com/jbenet/go-ipfs/p2p/net"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
)
10
p2p/net/mock/mock_stream.go
renamed
+1
-1
@@ -3,7 +3,7 @@ package mocknet
3
import (
4
"io"
5
6
- inet "github.com/jbenet/go-ipfs/net"
6
+ inet "github.com/jbenet/go-ipfs/p2p/net"
7
)
8
9
// stream implements inet.Stream
p2p/net/mock/mock_test.go
renamed
+1
-1
@@ -7,7 +7,7 @@ import (
7
"sync"
8
"testing"
9
10
- inet "github.com/jbenet/go-ipfs/net"
10
+ inet "github.com/jbenet/go-ipfs/p2p/net"
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
12
testutil "github.com/jbenet/go-ipfs/util/testutil"
13
p2p/net/services/identify/id.go
renamed
+3
-3
@@ -6,9 +6,9 @@ import (
6
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
7
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
8
9
- inet "github.com/jbenet/go-ipfs/net"
10
- handshake "github.com/jbenet/go-ipfs/net/handshake"
11
- pb "github.com/jbenet/go-ipfs/net/handshake/pb"
9
+ inet "github.com/jbenet/go-ipfs/p2p/net"
10
+ handshake "github.com/jbenet/go-ipfs/p2p/net/handshake"
11
+ pb "github.com/jbenet/go-ipfs/p2p/net/handshake/pb"
12
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
13
)
14
p2p/net/services/identify/id_test.go
renamed
+3
-3
@@ -4,9 +4,9 @@ import (
4
"testing"
5
"time"
6
7
- inet "github.com/jbenet/go-ipfs/net"
8
- handshake "github.com/jbenet/go-ipfs/net/handshake"
9
- netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
7
+ inet "github.com/jbenet/go-ipfs/p2p/net"
8
+ handshake "github.com/jbenet/go-ipfs/p2p/net/handshake"
9
+ netutil "github.com/jbenet/go-ipfs/p2p/net/swarmnet/util"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
12
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/net/services/mux/mux.go
renamed
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
10
- inet "github.com/jbenet/go-ipfs/net"
10
+ inet "github.com/jbenet/go-ipfs/p2p/net"
11
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
12
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
13
)
p2p/net/services/mux/mux_test.go
renamed
+1
-1
@@ -4,7 +4,7 @@ import (
4
"bytes"
5
"testing"
6
7
- inet "github.com/jbenet/go-ipfs/net"
7
+ inet "github.com/jbenet/go-ipfs/p2p/net"
8
)
9
10
var testCases = map[string]string{
p2p/net/services/relay/relay.go
renamed
+1
-1
@@ -8,7 +8,7 @@ import (
8
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
9
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
10
11
- inet "github.com/jbenet/go-ipfs/net"
11
+ inet "github.com/jbenet/go-ipfs/p2p/net"
12
peer "github.com/jbenet/go-ipfs/p2p/peer"
13
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
14
)
p2p/net/services/relay/relay_test.go
renamed
+4
-4
@@ -4,10 +4,10 @@ import (
4
"io"
5
"testing"
6
7
- inet "github.com/jbenet/go-ipfs/net"
8
- mux "github.com/jbenet/go-ipfs/net/services/mux"
9
- relay "github.com/jbenet/go-ipfs/net/services/relay"
10
- netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
7
+ inet "github.com/jbenet/go-ipfs/p2p/net"
8
+ mux "github.com/jbenet/go-ipfs/p2p/net/services/mux"
9
+ relay "github.com/jbenet/go-ipfs/p2p/net/services/relay"
10
+ netutil "github.com/jbenet/go-ipfs/p2p/net/swarmnet/util"
11
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
12
13
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/net/swarm/addr.go
renamed
+1
-1
@@ -1,7 +1,7 @@
1
package swarm
2
3
import (
4
- conn "github.com/jbenet/go-ipfs/net/conn"
4
+ conn "github.com/jbenet/go-ipfs/p2p/net/conn"
5
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
6
7
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/net/swarm/simul_test.go
renamed
p2p/net/swarm/swarm.go
renamed
p2p/net/swarm/swarm_conn.go
renamed
+1
-1
@@ -3,8 +3,8 @@ package swarm
3
import (
4
"fmt"
5
6
- conn "github.com/jbenet/go-ipfs/net/conn"
6
ic "github.com/jbenet/go-ipfs/p2p/crypto"
7
+ conn "github.com/jbenet/go-ipfs/p2p/net/conn"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/net/swarm/swarm_dial.go
renamed
+1
-1
@@ -4,7 +4,7 @@ import (
4
"errors"
5
"fmt"
6
7
- conn "github.com/jbenet/go-ipfs/net/conn"
7
+ conn "github.com/jbenet/go-ipfs/p2p/net/conn"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
10
p2p/net/swarm/swarm_listen.go
renamed
+1
-1
@@ -1,7 +1,7 @@
1
package swarm
2
3
import (
4
- conn "github.com/jbenet/go-ipfs/net/conn"
4
+ conn "github.com/jbenet/go-ipfs/p2p/net/conn"
5
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
6
7
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/net/swarm/swarm_stream.go
renamed
p2p/net/swarm/swarm_test.go
renamed
p2p/net/swarmnet/net.go
renamed
+5
-5
@@ -7,11 +7,11 @@ import (
7
ic "github.com/jbenet/go-ipfs/p2p/crypto"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10
- inet "github.com/jbenet/go-ipfs/net"
11
- ids "github.com/jbenet/go-ipfs/net/services/identify"
12
- mux "github.com/jbenet/go-ipfs/net/services/mux"
13
- relay "github.com/jbenet/go-ipfs/net/services/relay"
14
- swarm "github.com/jbenet/go-ipfs/net/swarm"
10
+ inet "github.com/jbenet/go-ipfs/p2p/net"
11
+ ids "github.com/jbenet/go-ipfs/p2p/net/services/identify"
12
+ mux "github.com/jbenet/go-ipfs/p2p/net/services/mux"
13
+ relay "github.com/jbenet/go-ipfs/p2p/net/services/relay"
14
+ swarm "github.com/jbenet/go-ipfs/p2p/net/swarm"
15
16
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
17
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
p2p/net/swarmnet/net_test.go
renamed
+2
-2
@@ -7,8 +7,8 @@ import (
7
8
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
10
- inet "github.com/jbenet/go-ipfs/net"
11
- netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
10
+ inet "github.com/jbenet/go-ipfs/p2p/net"
11
+ netutil "github.com/jbenet/go-ipfs/p2p/net/swarmnet/util"
12
)
13
14
// TestConnectednessCorrect starts a few networks, connects a few
p2p/net/swarmnet/util/util.go
renamed
+2
-2
@@ -3,8 +3,8 @@ package testutil
3
import (
4
"testing"
5
6
- inet "github.com/jbenet/go-ipfs/net"
7
- sn "github.com/jbenet/go-ipfs/net/swarmnet"
6
+ inet "github.com/jbenet/go-ipfs/p2p/net"
7
+ sn "github.com/jbenet/go-ipfs/p2p/net/swarmnet"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
tu "github.com/jbenet/go-ipfs/util/testutil"
10
routing/dht/dht.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"sync"
11
"time"
12
13
- inet "github.com/jbenet/go-ipfs/net"
13
+ inet "github.com/jbenet/go-ipfs/p2p/net"
14
peer "github.com/jbenet/go-ipfs/p2p/peer"
15
routing "github.com/jbenet/go-ipfs/routing"
16
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
routing/dht/dht_net.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"errors"
5
"time"
6
7
- inet "github.com/jbenet/go-ipfs/net"
7
+ inet "github.com/jbenet/go-ipfs/p2p/net"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
10
ctxutil "github.com/jbenet/go-ipfs/util/ctx"
routing/dht/dht_test.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
15
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
16
17
- swarmnet "github.com/jbenet/go-ipfs/net/swarmnet"
17
+ swarmnet "github.com/jbenet/go-ipfs/p2p/net/swarmnet"
18
peer "github.com/jbenet/go-ipfs/p2p/peer"
19
routing "github.com/jbenet/go-ipfs/routing"
20
u "github.com/jbenet/go-ipfs/util"
routing/dht/ext_test.go
+2
-2
@@ -4,8 +4,8 @@ import (
4
"math/rand"
5
"testing"
6
7
- inet "github.com/jbenet/go-ipfs/net"
8
- mocknet "github.com/jbenet/go-ipfs/net/mock"
7
+ inet "github.com/jbenet/go-ipfs/p2p/net"
8
+ mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
routing "github.com/jbenet/go-ipfs/routing"
11
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
routing/dht/pb/message.go
+1
-1
@@ -3,7 +3,7 @@ package dht_pb
3
import (
4
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
5
6
- inet "github.com/jbenet/go-ipfs/net"
6
+ inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
9
)
routing/dht/query.go
+1
-1
@@ -3,7 +3,7 @@ package dht
3
import (
4
"sync"
5
6
- inet "github.com/jbenet/go-ipfs/net"
6
+ inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
queue "github.com/jbenet/go-ipfs/p2p/peer/queue"
9
"github.com/jbenet/go-ipfs/routing"
routing/dht/routing.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
9
- inet "github.com/jbenet/go-ipfs/net"
9
+ inet "github.com/jbenet/go-ipfs/p2p/net"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
"github.com/jbenet/go-ipfs/routing"
12
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
routing/mock/dht.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
6
sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
7
- mocknet "github.com/jbenet/go-ipfs/net/mock"
7
+ mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
8
dht "github.com/jbenet/go-ipfs/routing/dht"
9
"github.com/jbenet/go-ipfs/util/testutil"
10
)