Skip to content

GitLab

Commit ada8212c authored by Jeromy's avatar Jeromy
Browse files

path rewrites

parent 451945c2
Hide whitespace changes
Inline Side-by-side
p2p/net/conn/dial.go
View file @ ada8212c
...@@ -6,9 +6,9 @@ import ( ...@@ -6,9 +6,9 @@ import (
"strings" "strings"
lgbl "github.com/ipfs/go-libp2p/loggables" lgbl "github.com/ipfs/go-libp2p/loggables"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ci "github.com/ipfs/go-libp2p/p2p/crypto" ci "github.com/ipfs/go-libp2p/p2p/crypto"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
......
p2p/net/conn/dial_test.go
View file @ ada8212c
...@@ -13,8 +13,8 @@ import ( ...@@ -13,8 +13,8 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
tu "github.com/ipfs/go-libp2p/testutil" tu "github.com/ipfs/go-libp2p/testutil"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func echoListen(ctx context.Context, listener Listener) { func echoListen(ctx context.Context, listener Listener) {
......
p2p/net/conn/interface.go
View file @ ada8212c
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
transport "github.com/ipfs/go-libp2p/p2p/net/transport" transport "github.com/ipfs/go-libp2p/p2p/net/transport"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
) )
type PeerConn interface { type PeerConn interface {
......
p2p/net/conn/listen.go
View file @ ada8212c
...@@ -5,11 +5,11 @@ import ( ...@@ -5,11 +5,11 @@ import (
"io" "io"
"net" "net"
ma "github.com/jbenet/go-multiaddr" "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
tec "github.com/jbenet/go-temp-err-catcher" goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
"github.com/jbenet/goprocess" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
goprocessctx "github.com/jbenet/goprocess/context" tec "gx/ipfs/QmWHgLqrghM9zw77nF6gdvT9ExQ2RB9pLxkd8sDHZf1rWb/go-temp-err-catcher"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ic "github.com/ipfs/go-libp2p/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
filter "github.com/ipfs/go-libp2p/p2p/net/filter" filter "github.com/ipfs/go-libp2p/p2p/net/filter"
......
p2p/net/conn/secure_conn.go
View file @ ada8212c
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"net" "net"
"time" "time"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ic "github.com/ipfs/go-libp2p/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
secio "github.com/ipfs/go-libp2p/p2p/crypto/secio" secio "github.com/ipfs/go-libp2p/p2p/crypto/secio"
......
p2p/net/conn/secure_conn_test.go
View file @ ada8212c
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
ic "github.com/ipfs/go-libp2p/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
travis "github.com/ipfs/go-libp2p/testutil/ci/travis" travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) { func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) {
......
p2p/net/filter/filter.go
View file @ ada8212c
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"strings" "strings"
"sync" "sync"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
) )
type Filters struct { type Filters struct {
......
p2p/net/interface.go
View file @ ada8212c
...@@ -6,9 +6,9 @@ import ( ...@@ -6,9 +6,9 @@ import (
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/jbenet/go-multiaddr" "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
"github.com/jbenet/goprocess" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
// MessageSizeMax is a soft (recommended) maximum for network messages. // MessageSizeMax is a soft (recommended) maximum for network messages.
......
p2p/net/mock/interface.go
View file @ ada8212c
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"io" "io"
"time" "time"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
) )
type Mocknet interface { type Mocknet interface {
......
p2p/net/mock/mock.go
View file @ ada8212c
package mocknet package mocknet
import ( import (
logging "github.com/ipfs/go-log" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
var log = logging.Logger("mocknet") var log = logging.Logger("mocknet")
......
p2p/net/mock/mock_conn.go
View file @ ada8212c
...@@ -8,8 +8,8 @@ import ( ...@@ -8,8 +8,8 @@ import (
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/jbenet/go-multiaddr" process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
process "github.com/jbenet/goprocess" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
) )
// conn represents one side's perspective of a // conn represents one side's perspective of a
......
p2p/net/mock/mock_net.go
View file @ ada8212c
...@@ -13,10 +13,10 @@ import ( ...@@ -13,10 +13,10 @@ import (
p2putil "github.com/ipfs/go-libp2p/p2p/test/util" p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
ma "github.com/jbenet/go-multiaddr" "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
"github.com/jbenet/goprocess" goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
goprocessctx "github.com/jbenet/goprocess/context" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
// mocknet implements mocknet.Mocknet // mocknet implements mocknet.Mocknet
......
p2p/net/mock/mock_notif_test.go
View file @ ada8212c
...@@ -6,8 +6,8 @@ import ( ...@@ -6,8 +6,8 @@ import (
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func TestNotifications(t *testing.T) { func TestNotifications(t *testing.T) {
......
p2p/net/mock/mock_peernet.go
View file @ ada8212c
...@@ -8,10 +8,10 @@ import ( ...@@ -8,10 +8,10 @@ import (
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/jbenet/go-multiaddr" "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
"github.com/jbenet/goprocess" goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
goprocessctx "github.com/jbenet/goprocess/context" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
// peernet implements inet.Network // peernet implements inet.Network
......
p2p/net/mock/mock_stream.go
View file @ ada8212c
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"io" "io"
"time" "time"
process "github.com/jbenet/goprocess" process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
) )
......
p2p/net/mock/mock_test.go
View file @ ada8212c
...@@ -14,8 +14,8 @@ import ( ...@@ -14,8 +14,8 @@ import (
protocol "github.com/ipfs/go-libp2p/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
detectrace "github.com/jbenet/go-detect-race" detectrace "gx/ipfs/QmQHGMVmrsgmqUG8ih3puNXUJneSpi13dkcZpzLKkskUkH/go-detect-race"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func randPeer(t *testing.T) peer.ID { func randPeer(t *testing.T) peer.ID {
......
p2p/net/swarm/addr/addr.go
View file @ ada8212c
...@@ -3,11 +3,11 @@ package addrutil ...@@ -3,11 +3,11 @@ package addrutil
import ( import (
"fmt" "fmt"
logging "github.com/ipfs/go-log" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr") var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr")
......
p2p/net/swarm/addr/addr_test.go
View file @ ada8212c
...@@ -3,8 +3,8 @@ package addrutil ...@@ -3,8 +3,8 @@ package addrutil
import ( import (
"testing" "testing"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
) )
func newMultiaddr(t *testing.T, s string) ma.Multiaddr { func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
......
p2p/net/swarm/dial_test.go
View file @ ada8212c
...@@ -13,9 +13,9 @@ import ( ...@@ -13,9 +13,9 @@ import (
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
ci "github.com/ipfs/go-libp2p/testutil/ci" ci "github.com/ipfs/go-libp2p/testutil/ci"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func acceptAndHang(l net.Listener) { func acceptAndHang(l net.Listener) {
......
p2p/net/swarm/peers_test.go
View file @ ada8212c
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func TestPeers(t *testing.T) { func TestPeers(t *testing.T) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment