Skip to content

GitLab

Commit 216db146 authored by Jeromy's avatar Jeromy
Browse files

more vendoring

parent e1427950
Hide whitespace changes
Inline Side-by-side
p2p/discovery/mdns.go
View file @ 216db146
...@@ -9,13 +9,13 @@ import ( ...@@ -9,13 +9,13 @@ import (
"sync" "sync"
"time" "time"
ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
"github.com/cryptix/mdns" "github.com/cryptix/mdns"
ma "github.com/jbenet/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net"
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
"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 "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
) )
var log = logging.Logger("mdns") var log = logging.Logger("mdns")
......
p2p/host/basic/basic_host.go
View file @ 216db146
...@@ -4,9 +4,9 @@ import ( ...@@ -4,9 +4,9 @@ import (
"io" "io"
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
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"
ma "github.com/jbenet/go-multiaddr"
goprocess "github.com/jbenet/goprocess" goprocess "github.com/jbenet/goprocess"
context "golang.org/x/net/context" context "golang.org/x/net/context"
......
p2p/host/basic/natmgr.go
View file @ 216db146
...@@ -3,7 +3,7 @@ package basichost ...@@ -3,7 +3,7 @@ package basichost
import ( import (
"sync" "sync"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
goprocess "github.com/jbenet/goprocess" goprocess "github.com/jbenet/goprocess"
context "golang.org/x/net/context" context "golang.org/x/net/context"
......
p2p/host/host.go
View file @ 216db146
...@@ -2,11 +2,11 @@ package host ...@@ -2,11 +2,11 @@ package host
import ( import (
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
metrics "github.com/ipfs/go-libp2p/p2p/metrics" metrics "github.com/ipfs/go-libp2p/p2p/metrics"
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"
ma "github.com/jbenet/go-multiaddr"
context "golang.org/x/net/context" context "golang.org/x/net/context"
msmux "github.com/whyrusleeping/go-multistream" msmux "github.com/whyrusleeping/go-multistream"
......
p2p/host/routed/routed.go
View file @ 216db146
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"time" "time"
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
context "golang.org/x/net/context" context "golang.org/x/net/context"
lgbl "util/eventlog/loggables" lgbl "util/eventlog/loggables"
......
p2p/nat/nat.go
View file @ 216db146
...@@ -8,14 +8,14 @@ import ( ...@@ -8,14 +8,14 @@ import (
"sync" "sync"
"time" "time"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
nat "github.com/fd/go-nat" nat "github.com/fd/go-nat"
goprocess "github.com/jbenet/goprocess" goprocess "github.com/jbenet/goprocess"
periodic "github.com/jbenet/goprocess/periodic" periodic "github.com/jbenet/goprocess/periodic"
notifier "thirdparty/notifier" notifier "thirdparty/notifier"
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
) )
var ( var (
......
p2p/net/conn/conn.go
View file @ 216db146
...@@ -6,15 +6,15 @@ import ( ...@@ -6,15 +6,15 @@ import (
"net" "net"
"time" "time"
mpool "github.com/jbenet/go-msgio/mpool" logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
context "golang.org/x/net/context"
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"
mpool "github.com/jbenet/go-msgio/mpool"
context "golang.org/x/net/context"
u "util" u "util"
lgbl "util/eventlog/loggables" lgbl "util/eventlog/loggables"
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
) )
var log = logging.Logger("conn") var log = logging.Logger("conn")
......
p2p/net/conn/dial.go
View file @ 216db146
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"math/rand" "math/rand"
"strings" "strings"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
context "golang.org/x/net/context" context "golang.org/x/net/context"
lgbl "util/eventlog/loggables" lgbl "util/eventlog/loggables"
......
p2p/net/conn/dial_test.go
View file @ 216db146
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
tu "util/testutil" tu "util/testutil"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
context "golang.org/x/net/context" context "golang.org/x/net/context"
) )
......
p2p/net/conn/interface.go
View file @ 216db146
...@@ -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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
) )
type PeerConn interface { type PeerConn interface {
......
p2p/net/conn/listen.go
View file @ 216db146
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"io" "io"
"net" "net"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
tec "github.com/jbenet/go-temp-err-catcher" tec "github.com/jbenet/go-temp-err-catcher"
"github.com/jbenet/goprocess" "github.com/jbenet/goprocess"
goprocessctx "github.com/jbenet/goprocess/context" goprocessctx "github.com/jbenet/goprocess/context"
......
p2p/net/conn/secure_conn.go
View file @ 216db146
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"net" "net"
"time" "time"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
context "golang.org/x/net/context" context "golang.org/x/net/context"
ic "github.com/ipfs/go-libp2p/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
......
p2p/net/filter/filter.go
View file @ 216db146
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"strings" "strings"
"sync" "sync"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
) )
type Filters struct { type Filters struct {
......
p2p/net/interface.go
View file @ 216db146
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ 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" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
"github.com/jbenet/goprocess" "github.com/jbenet/goprocess"
context "golang.org/x/net/context" context "golang.org/x/net/context"
) )
......
p2p/net/mock/interface.go
View file @ 216db146
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"io" "io"
"time" "time"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
) )
type Mocknet interface { type Mocknet interface {
......
p2p/net/mock/mock_conn.go
View file @ 216db146
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
process "github.com/jbenet/goprocess" process "github.com/jbenet/goprocess"
) )
......
p2p/net/mock/mock_net.go
View file @ 216db146
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
p2putil "github.com/ipfs/go-libp2p/p2p/test/util" p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
testutil "util/testutil" testutil "util/testutil"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
"github.com/jbenet/goprocess" "github.com/jbenet/goprocess"
goprocessctx "github.com/jbenet/goprocess/context" goprocessctx "github.com/jbenet/goprocess/context"
context "golang.org/x/net/context" context "golang.org/x/net/context"
......
p2p/net/mock/mock_notif_test.go
View file @ 216db146
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"testing" "testing"
"time" "time"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
context "golang.org/x/net/context"
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"
context "golang.org/x/net/context"
) )
func TestNotifications(t *testing.T) { func TestNotifications(t *testing.T) {
......
p2p/net/mock/mock_peernet.go
View file @ 216db146
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
"github.com/jbenet/goprocess" "github.com/jbenet/goprocess"
goprocessctx "github.com/jbenet/goprocess/context" goprocessctx "github.com/jbenet/goprocess/context"
context "golang.org/x/net/context" context "golang.org/x/net/context"
......
p2p/net/swarm/addr/addr.go
View file @ 216db146
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
ma "github.com/jbenet/go-multiaddr" ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net"
context "golang.org/x/net/context" context "golang.org/x/net/context"
) )
......
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