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
loggables/loggables.go
View file @ ada8212c
...@@ -9,9 +9,9 @@ package loggables ...@@ -9,9 +9,9 @@ package loggables
import ( import (
"net" "net"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
logging "github.com/ipfs/go-log" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
......
p2p/crypto/key.go
View file @ ada8212c
...@@ -21,10 +21,10 @@ import ( ...@@ -21,10 +21,10 @@ import (
pb "github.com/ipfs/go-libp2p/p2p/crypto/pb" pb "github.com/ipfs/go-libp2p/p2p/crypto/pb"
proto "github.com/gogo/protobuf/proto" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
u "github.com/ipfs/go-ipfs-util" u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
logging "github.com/ipfs/go-log" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
) )
var log = logging.Logger("crypto") var log = logging.Logger("crypto")
......
p2p/crypto/pb/crypto.pb.go
View file @ ada8212c
...@@ -14,7 +14,7 @@ It has these top-level messages: ...@@ -14,7 +14,7 @@ It has these top-level messages:
*/ */
package crypto_pb package crypto_pb
import proto "github.com/gogo/protobuf/proto" import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
import math "math" import math "math"
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
......
p2p/crypto/rsa.go
View file @ ada8212c
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"crypto/x509" "crypto/x509"
"errors" "errors"
proto "github.com/gogo/protobuf/proto" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
pb "github.com/ipfs/go-libp2p/p2p/crypto/pb" pb "github.com/ipfs/go-libp2p/p2p/crypto/pb"
) )
......
p2p/crypto/secio/al.go
View file @ ada8212c
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"hash" "hash"
ci "github.com/ipfs/go-libp2p/p2p/crypto" ci "github.com/ipfs/go-libp2p/p2p/crypto"
bfish "golang.org/x/crypto/blowfish" bfish "gx/ipfs/Qme1boxspcQWR8FBzMxeppqug2fYgYc15diNWmqgDVnvn2/go-crypto/blowfish"
) )
// List of supported ECDH curves // List of supported ECDH curves
......
p2p/crypto/secio/interface.go
View file @ ada8212c
...@@ -7,8 +7,8 @@ import ( ...@@ -7,8 +7,8 @@ import (
ci "github.com/ipfs/go-libp2p/p2p/crypto" ci "github.com/ipfs/go-libp2p/p2p/crypto"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
msgio "github.com/jbenet/go-msgio" msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
// SessionGenerator constructs secure communication sessions for a peer. // SessionGenerator constructs secure communication sessions for a peer.
......
p2p/crypto/secio/pb/spipe.pb.go
View file @ ada8212c
...@@ -14,7 +14,7 @@ It has these top-level messages: ...@@ -14,7 +14,7 @@ It has these top-level messages:
*/ */
package spipe_pb package spipe_pb
import proto "github.com/gogo/protobuf/proto" import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
import math "math" import math "math"
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
......
p2p/crypto/secio/protocol.go
View file @ ada8212c
...@@ -9,13 +9,13 @@ import ( ...@@ -9,13 +9,13 @@ import (
"sync" "sync"
"time" "time"
u "github.com/ipfs/go-ipfs-util"
ci "github.com/ipfs/go-libp2p/p2p/crypto" ci "github.com/ipfs/go-libp2p/p2p/crypto"
pb "github.com/ipfs/go-libp2p/p2p/crypto/secio/pb" pb "github.com/ipfs/go-libp2p/p2p/crypto/secio/pb"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
logging "github.com/ipfs/go-log" msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio"
msgio "github.com/jbenet/go-msgio" u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
) )
var log = logging.Logger("secio") var log = logging.Logger("secio")
......
p2p/crypto/secio/rw.go
View file @ ada8212c
...@@ -9,10 +9,10 @@ import ( ...@@ -9,10 +9,10 @@ import (
"crypto/hmac" "crypto/hmac"
proto "github.com/gogo/protobuf/proto" msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio"
msgio "github.com/jbenet/go-msgio" mpool "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio/mpool"
mpool "github.com/jbenet/go-msgio/mpool" proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
const MaxMsgSize = 8 * 1024 * 1024 const MaxMsgSize = 8 * 1024 * 1024
......
p2p/discovery/mdns.go
View file @ ada8212c
...@@ -9,13 +9,13 @@ import ( ...@@ -9,13 +9,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/cryptix/mdns" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
ma "github.com/jbenet/go-multiaddr" "gx/ipfs/QmSscYPCcE1H3UQr2tnsJ2a9dK9LsHTBGgP71VW6fz67e5/mdns"
manet "github.com/jbenet/go-multiaddr-net" manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
"github.com/ipfs/go-libp2p/p2p/host" "github.com/ipfs/go-libp2p/p2p/host"
"github.com/ipfs/go-libp2p/p2p/peer" "github.com/ipfs/go-libp2p/p2p/peer"
logging "github.com/ipfs/go-log" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
) )
var log = logging.Logger("mdns") var log = logging.Logger("mdns")
......
p2p/host/basic/basic_host.go
View file @ ada8212c
...@@ -5,10 +5,10 @@ import ( ...@@ -5,10 +5,10 @@ import (
metrics "github.com/ipfs/go-libp2p/p2p/metrics" metrics "github.com/ipfs/go-libp2p/p2p/metrics"
mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream" mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream"
logging "github.com/ipfs/go-log" goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
ma "github.com/jbenet/go-multiaddr" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
goprocess "github.com/jbenet/goprocess" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
context "golang.org/x/net/context" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
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"
...@@ -16,7 +16,7 @@ import ( ...@@ -16,7 +16,7 @@ import (
identify "github.com/ipfs/go-libp2p/p2p/protocol/identify" identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
relay "github.com/ipfs/go-libp2p/p2p/protocol/relay" relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
msmux "github.com/whyrusleeping/go-multistream" msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream"
) )
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/basic") var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/basic")
......
p2p/host/basic/basic_host_test.go
View file @ ada8212c
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
protocol "github.com/ipfs/go-libp2p/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
testutil "github.com/ipfs/go-libp2p/p2p/test/util" testutil "github.com/ipfs/go-libp2p/p2p/test/util"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func TestHostSimple(t *testing.T) { func TestHostSimple(t *testing.T) {
......
p2p/host/basic/natmgr.go
View file @ ada8212c
...@@ -3,9 +3,9 @@ package basichost ...@@ -3,9 +3,9 @@ package basichost
import ( import (
"sync" "sync"
ma "github.com/jbenet/go-multiaddr" goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
goprocess "github.com/jbenet/goprocess" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
lgbl "github.com/ipfs/go-libp2p/loggables" lgbl "github.com/ipfs/go-libp2p/loggables"
inat "github.com/ipfs/go-libp2p/p2p/nat" inat "github.com/ipfs/go-libp2p/p2p/nat"
......
p2p/host/host.go
View file @ ada8212c
...@@ -5,11 +5,11 @@ import ( ...@@ -5,11 +5,11 @@ 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"
protocol "github.com/ipfs/go-libp2p/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
logging "github.com/ipfs/go-log" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
ma "github.com/jbenet/go-multiaddr" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
context "golang.org/x/net/context" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
msmux "github.com/whyrusleeping/go-multistream" msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream"
) )
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host") var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host")
......
p2p/host/routed/routed.go
View file @ ada8212c
...@@ -5,9 +5,9 @@ import ( ...@@ -5,9 +5,9 @@ import (
"time" "time"
lgbl "github.com/ipfs/go-libp2p/loggables" lgbl "github.com/ipfs/go-libp2p/loggables"
logging "github.com/ipfs/go-log" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
ma "github.com/jbenet/go-multiaddr" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
context "golang.org/x/net/context" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
host "github.com/ipfs/go-libp2p/p2p/host" host "github.com/ipfs/go-libp2p/p2p/host"
metrics "github.com/ipfs/go-libp2p/p2p/metrics" metrics "github.com/ipfs/go-libp2p/p2p/metrics"
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
msmux "github.com/whyrusleeping/go-multistream" msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream"
) )
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/routed") var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/routed")
......
p2p/metrics/bw_stats.go
View file @ ada8212c
package metrics package metrics
import ( import (
gm "github.com/whyrusleeping/go-metrics" gm "gx/ipfs/QmeYJHEk8UjVVZ4XCRTZe6dFQrb8pGWD81LYCgeLp8CvMB/go-metrics"
"sync" "sync"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
......
p2p/metrics/stream/metered_test.go
View file @ ada8212c
...@@ -5,10 +5,10 @@ import ( ...@@ -5,10 +5,10 @@ import (
"io/ioutil" "io/ioutil"
"testing" "testing"
randbo "github.com/dustin/randbo"
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"
protocol "github.com/ipfs/go-libp2p/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
randbo "gx/ipfs/QmYvsG72GsfLgUeSojXArjnU6L4Wmwk7wuAxtNLuyXcc1T/randbo"
) )
type FakeStream struct { type FakeStream struct {
......
p2p/nat/nat.go
View file @ ada8212c
...@@ -8,14 +8,14 @@ import ( ...@@ -8,14 +8,14 @@ import (
"sync" "sync"
"time" "time"
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"
nat "github.com/fd/go-nat" nat "gx/ipfs/QmNLvkCDV6ZjUJsEwGNporYBuZdhWT6q7TBVYQwwRv12HT/go-nat"
logging "github.com/ipfs/go-log" goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
goprocess "github.com/jbenet/goprocess" periodic "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic"
periodic "github.com/jbenet/goprocess/periodic" logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
notifier "github.com/whyrusleeping/go-notifier" notifier "gx/ipfs/QmbcS9XrwZkF1rZj8bBwwzoYhVuA2PCnPhFUL1pyWGgt2A/go-notifier"
) )
var ( var (
......
p2p/net/conn/conn.go
View file @ ada8212c
...@@ -6,15 +6,15 @@ import ( ...@@ -6,15 +6,15 @@ import (
"net" "net"
"time" "time"
u "github.com/ipfs/go-ipfs-util"
lgbl "github.com/ipfs/go-libp2p/loggables" lgbl "github.com/ipfs/go-libp2p/loggables"
ic "github.com/ipfs/go-libp2p/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
logging "github.com/ipfs/go-log" ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
mpool "github.com/jbenet/go-msgio/mpool" mpool "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio/mpool"
ma "github.com/jbenet/go-multiaddr" manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
manet "github.com/jbenet/go-multiaddr-net" u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
) )
var log = logging.Logger("conn") var log = logging.Logger("conn")
......
p2p/net/conn/conn_test.go
View file @ ada8212c
...@@ -9,8 +9,8 @@ import ( ...@@ -9,8 +9,8 @@ import (
"time" "time"
travis "github.com/ipfs/go-libp2p/testutil/ci/travis" travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
msgio "github.com/jbenet/go-msgio" msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio"
context "golang.org/x/net/context" context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
) )
func msgioWrap(c Conn) msgio.ReadWriter { func msgioWrap(c Conn) msgio.ReadWriter {
......
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