Skip to content

GitLab

Commit 8744e460 authored by Jeromy's avatar Jeromy
Browse files

update local import paths to reflect org change

parent c0e2b930
master 2018-Q4-OKR docs-improvements feat/backoff-listing feat/p2p-multiaddr feat/pnet/working3 feat/protobuf feat/relay-integrate feat/udp feat/update/go-reuseport feature/standardize-readme fix/473 fix/no-custom-field fix/reset-ping-stream fix/revert-correct-external-addr gx/update-jccl6u gx/update-nza0mn jenkinsfile kevina/fix-go-vet multistream-ping punching revert-276-update-go-detect-race v6.0.23 v6.0.22 v6.0.21 v6.0.20 v6.0.19 v6.0.18 v6.0.17 v6.0.16 v6.0.15 v6.0.14 v6.0.13 v6.0.12 v6.0.11 v6.0.10 v6.0.9 v6.0.8 v6.0.7 v6.0.6 v6.0.5 v6.0.4 v6.0.3 v6.0.2 v6.0.1 v6.0.0 v5.0.21 v5.0.20 v5.0.19 v5.0.18 v5.0.17 v5.0.16 v5.0.15 v5.0.14 v5.0.13 v5.0.12 v5.0.11 v5.0.10 v5.0.9 v5.0.8 v5.0.7 v5.0.6 v5.0.5 v5.0.4 v5.0.3 v5.0.2 v5.0.1 v5.0.0 v4.5.5 v4.5.4 v4.5.3 v4.5.2 v4.5.1 v4.5.0 v4.4.5 v4.4.4 v4.4.3 v4.4.2 v4.4.1 v4.4.0 v4.3.12 v4.3.11 v4.3.10 v4.3.9 v4.3.8 v4.3.7 v4.3.6 v4.3.5 v4.3.4 v4.3.3 v4.3.2 v4.3.1 v4.3.0 v4.2.0 v4.1.0 v4.0.4 v4.0.3 v4.0.2 v4.0.1 v4.0.0 v3.6.0 v3.5.4 v3.5.3 v3.5.2 v3.5.1 v3.5.0 v3.4.3 v3.4.2 v3.4.1 v3.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 46 deletions
+46 -46
examples/hosts/main.go
View file @ 8744e460
......@@ -7,13 +7,13 @@ import (
"log"
pstore "github.com/ipfs/go-libp2p-peerstore"
host "github.com/ipfs/go-libp2p/p2p/host"
bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
metrics "github.com/ipfs/go-libp2p/p2p/metrics"
net "github.com/ipfs/go-libp2p/p2p/net"
conn "github.com/ipfs/go-libp2p/p2p/net/conn"
swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
testutil "github.com/ipfs/go-libp2p/testutil"
host "github.com/libp2p/go-libp2p/p2p/host"
bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
metrics "github.com/libp2p/go-libp2p/p2p/metrics"
net "github.com/libp2p/go-libp2p/p2p/net"
conn "github.com/libp2p/go-libp2p/p2p/net/conn"
swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
testutil "github.com/libp2p/go-libp2p/testutil"
ipfsaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
ma "github.com/jbenet/go-multiaddr"
......
p2p/discovery/mdns.go
View file @ 8744e460
......@@ -12,10 +12,10 @@ import (
"github.com/cryptix/mdns"
"github.com/ipfs/go-libp2p-peer"
pstore "github.com/ipfs/go-libp2p-peerstore"
"github.com/ipfs/go-libp2p/p2p/host"
logging "github.com/ipfs/go-log"
ma "github.com/jbenet/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net"
"github.com/libp2p/go-libp2p/p2p/host"
)
var log = logging.Logger("mdns")
......
p2p/host/basic/basic_host.go
View file @ 8744e460
......@@ -5,21 +5,21 @@ import (
peer "github.com/ipfs/go-libp2p-peer"
pstore "github.com/ipfs/go-libp2p-peerstore"
metrics "github.com/ipfs/go-libp2p/p2p/metrics"
mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream"
inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
logging "github.com/ipfs/go-log"
ma "github.com/jbenet/go-multiaddr"
goprocess "github.com/jbenet/goprocess"
metrics "github.com/libp2p/go-libp2p/p2p/metrics"
mstream "github.com/libp2p/go-libp2p/p2p/metrics/stream"
inet "github.com/libp2p/go-libp2p/p2p/net"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
identify "github.com/libp2p/go-libp2p/p2p/protocol/identify"
relay "github.com/libp2p/go-libp2p/p2p/protocol/relay"
context "golang.org/x/net/context"
msmux "github.com/whyrusleeping/go-multistream"
)
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/basic")
var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/host/basic")
// Option is a type used to pass in options to the host.
type Option int
......
p2p/host/basic/basic_host_test.go
View file @ 8744e460
......@@ -5,9 +5,9 @@ import (
"io"
"testing"
inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
testutil "github.com/ipfs/go-libp2p/p2p/test/util"
inet "github.com/libp2p/go-libp2p/p2p/net"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
testutil "github.com/libp2p/go-libp2p/p2p/test/util"
context "golang.org/x/net/context"
)
......
p2p/host/basic/natmgr.go
View file @ 8744e460
......@@ -4,10 +4,10 @@ import (
"sync"
lgbl "github.com/ipfs/go-libp2p-loggables"
inat "github.com/ipfs/go-libp2p/p2p/nat"
inet "github.com/ipfs/go-libp2p/p2p/net"
ma "github.com/jbenet/go-multiaddr"
goprocess "github.com/jbenet/goprocess"
inat "github.com/libp2p/go-libp2p/p2p/nat"
inet "github.com/libp2p/go-libp2p/p2p/net"
context "golang.org/x/net/context"
)
......
p2p/host/host.go
View file @ 8744e460
......@@ -3,16 +3,16 @@ package host
import (
peer "github.com/ipfs/go-libp2p-peer"
pstore "github.com/ipfs/go-libp2p-peerstore"
metrics "github.com/ipfs/go-libp2p/p2p/metrics"
inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
logging "github.com/ipfs/go-log"
ma "github.com/jbenet/go-multiaddr"
metrics "github.com/libp2p/go-libp2p/p2p/metrics"
inet "github.com/libp2p/go-libp2p/p2p/net"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
msmux "github.com/whyrusleeping/go-multistream"
context "golang.org/x/net/context"
)
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host")
var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/host")
// Host is an object participating in a p2p network, which
// implements protocols or provides services. It handles
......
p2p/host/routed/routed.go
View file @ 8744e460
......@@ -7,18 +7,18 @@ import (
lgbl "github.com/ipfs/go-libp2p-loggables"
peer "github.com/ipfs/go-libp2p-peer"
pstore "github.com/ipfs/go-libp2p-peerstore"
host "github.com/ipfs/go-libp2p/p2p/host"
metrics "github.com/ipfs/go-libp2p/p2p/metrics"
inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
logging "github.com/ipfs/go-log"
ma "github.com/jbenet/go-multiaddr"
host "github.com/libp2p/go-libp2p/p2p/host"
metrics "github.com/libp2p/go-libp2p/p2p/metrics"
inet "github.com/libp2p/go-libp2p/p2p/net"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
context "golang.org/x/net/context"
msmux "github.com/whyrusleeping/go-multistream"
)
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/routed")
var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/host/routed")
// AddressTTL is the expiry time for our addresses.
// We expire them quickly.
......
p2p/metrics/bw_stats.go
View file @ 8744e460
......@@ -5,7 +5,7 @@ import (
"sync"
peer "github.com/ipfs/go-libp2p-peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
)
type Stats struct {
......
p2p/metrics/conn/conn.go
View file @ 8744e460
......@@ -2,7 +2,7 @@ package meterconn
import (
transport "github.com/ipfs/go-libp2p-transport"
metrics "github.com/ipfs/go-libp2p/p2p/metrics"
metrics "github.com/libp2p/go-libp2p/p2p/metrics"
)
type MeteredConn struct {
......
p2p/metrics/interface.go
View file @ 8744e460
......@@ -2,7 +2,7 @@ package metrics
import (
peer "github.com/ipfs/go-libp2p-peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
)
type StreamMeterCallback func(int64, protocol.ID, peer.ID)
......
p2p/metrics/stream/metered.go
View file @ 8744e460
......@@ -2,9 +2,9 @@ package meterstream
import (
peer "github.com/ipfs/go-libp2p-peer"
metrics "github.com/ipfs/go-libp2p/p2p/metrics"
inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
metrics "github.com/libp2p/go-libp2p/p2p/metrics"
inet "github.com/libp2p/go-libp2p/p2p/net"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
)
type meteredStream struct {
......
p2p/metrics/stream/metered_test.go
View file @ 8744e460
......@@ -7,8 +7,8 @@ import (
randbo "github.com/dustin/randbo"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
inet "github.com/libp2p/go-libp2p/p2p/net"
protocol "github.com/libp2p/go-libp2p/p2p/protocol"
)
type FakeStream struct {
......
p2p/net/conn/conn_test.go
View file @ 8744e460
......@@ -8,8 +8,8 @@ import (
"testing"
"time"
travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
msgio "github.com/jbenet/go-msgio"
travis "github.com/libp2p/go-libp2p/testutil/ci/travis"
context "golang.org/x/net/context"
)
......
p2p/net/conn/dial.go
View file @ 8744e460
......@@ -10,9 +10,9 @@ import (
lgbl "github.com/ipfs/go-libp2p-loggables"
peer "github.com/ipfs/go-libp2p-peer"
transport "github.com/ipfs/go-libp2p-transport"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
ma "github.com/jbenet/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net"
addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
msmux "github.com/whyrusleeping/go-multistream"
context "golang.org/x/net/context"
)
......
p2p/net/conn/dial_test.go
View file @ 8744e460
......@@ -14,7 +14,7 @@ import (
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
transport "github.com/ipfs/go-libp2p-transport"
tu "github.com/ipfs/go-libp2p/testutil"
tu "github.com/libp2p/go-libp2p/testutil"
ma "github.com/jbenet/go-multiaddr"
msmux "github.com/whyrusleeping/go-multistream"
......
p2p/net/conn/interface.go
View file @ 8744e460
......@@ -8,8 +8,8 @@ import (
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
transport "github.com/ipfs/go-libp2p-transport"
filter "github.com/ipfs/go-libp2p/p2p/net/filter"
ma "github.com/jbenet/go-multiaddr"
filter "github.com/libp2p/go-libp2p/p2p/net/filter"
)
type PeerConn interface {
......
p2p/net/conn/listen.go
View file @ 8744e460
......@@ -10,11 +10,11 @@ import (
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
transport "github.com/ipfs/go-libp2p-transport"
filter "github.com/ipfs/go-libp2p/p2p/net/filter"
ma "github.com/jbenet/go-multiaddr"
tec "github.com/jbenet/go-temp-err-catcher"
"github.com/jbenet/goprocess"
goprocessctx "github.com/jbenet/goprocess/context"
filter "github.com/libp2p/go-libp2p/p2p/net/filter"
msmux "github.com/whyrusleeping/go-multistream"
context "golang.org/x/net/context"
)
......
p2p/net/conn/secure_conn_test.go
View file @ 8744e460
......@@ -8,7 +8,7 @@ import (
"time"
ic "github.com/ipfs/go-libp2p-crypto"
travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
travis "github.com/libp2p/go-libp2p/testutil/ci/travis"
context "golang.org/x/net/context"
)
......
p2p/net/interface.go
View file @ 8744e460
......@@ -5,9 +5,9 @@ import (
peer "github.com/ipfs/go-libp2p-peer"
pstore "github.com/ipfs/go-libp2p-peerstore"
conn "github.com/ipfs/go-libp2p/p2p/net/conn"
ma "github.com/jbenet/go-multiaddr"
"github.com/jbenet/goprocess"
conn "github.com/libp2p/go-libp2p/p2p/net/conn"
context "golang.org/x/net/context"
)
......
p2p/net/mock/interface.go
View file @ 8744e460
......@@ -10,8 +10,8 @@ import (
"io"
"time"
host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net"
host "github.com/libp2p/go-libp2p/p2p/host"
inet "github.com/libp2p/go-libp2p/p2p/net"
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
......
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