vendor in notifier

p2p/crypto/secio/interface.go

@@ -6,9 +6,9 @@ import (
 
 	ci "github.com/ipfs/go-libp2p/p2p/crypto"
 
-	msgio "github.com/jbenet/go-msgio"
-	context "golang.org/x/net/context"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	msgio "github.com/jbenet/go-msgio"
 )
 
 // SessionGenerator constructs secure communication sessions for a peer.

p2p/crypto/secio/protocol.go

@@ -9,13 +9,13 @@ import (
 	"sync"
 	"time"
 
-	msgio "github.com/jbenet/go-msgio"
-	context "golang.org/x/net/context"
+	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ci "github.com/ipfs/go-libp2p/p2p/crypto"
 	pb "github.com/ipfs/go-libp2p/p2p/crypto/secio/pb"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	msgio "github.com/jbenet/go-msgio"
 	u "util"
-	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 )
 
 var log = logging.Logger("secio")

p2p/crypto/secio/rw.go

@@ -9,10 +9,10 @@ import (
 
 	"crypto/hmac"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	proto "QmfH4HuZyN1p2wQLWWkXC91Z76435xKrBVfLQ2MY8ayG5R/gogo-protobuf/proto"
 	msgio "github.com/jbenet/go-msgio"
 	mpool "github.com/jbenet/go-msgio/mpool"
-	context "golang.org/x/net/context"
 )
 
 const MaxMsgSize = 8 * 1024 * 1024

p2p/host/basic/basic_host.go

@@ -3,12 +3,12 @@ package basichost
 import (
 	"io"
 
+	goprocess "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream"
-	goprocess "github.com/jbenet/goprocess"
-	context "golang.org/x/net/context"
 
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"

p2p/host/basic/basic_host_test.go

@@ -9,7 +9,7 @@ import (
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 
-	context "golang.org/x/net/context"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 )
 
 func TestHostSimple(t *testing.T) {

p2p/host/basic/natmgr.go

@@ -3,9 +3,9 @@ package basichost
 import (
 	"sync"
 
+	goprocess "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	goprocess "github.com/jbenet/goprocess"
-	context "golang.org/x/net/context"
 
 	inat "github.com/ipfs/go-libp2p/p2p/nat"
 	inet "github.com/ipfs/go-libp2p/p2p/net"

p2p/host/host.go

@@ -2,12 +2,12 @@ package host
 
 import (
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	context "golang.org/x/net/context"
 
 	msmux "github.com/whyrusleeping/go-multistream"
 )

p2p/host/routed/routed.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 	lgbl "util/eventlog/loggables"
 
 	host "github.com/ipfs/go-libp2p/p2p/host"

p2p/nat/nat.go

@@ -11,11 +11,11 @@ import (
 	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 
+	goprocess "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
+	periodic "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess/periodic"
+	notifier "QmUtEiB6DmXs7eLJiwS9YFyTAtptqzaWutxCsjHy7UKEgo/go-notifier"
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 	nat "github.com/fd/go-nat"
-	goprocess "github.com/jbenet/goprocess"
-	periodic "github.com/jbenet/goprocess/periodic"
-	notifier "thirdparty/notifier"
 )
 
 var (

p2p/net/conn/conn.go

@@ -8,11 +8,11 @@ import (
 
 	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	mpool "github.com/jbenet/go-msgio/mpool"
-	context "golang.org/x/net/context"
 	u "util"
 	lgbl "util/eventlog/loggables"
 )

p2p/net/conn/conn_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	msgio "github.com/jbenet/go-msgio"
-	context "golang.org/x/net/context"
 	travis "util/testutil/ci/travis"
 )
 

p2p/net/conn/dial.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 	lgbl "util/eventlog/loggables"
 
 	ci "github.com/ipfs/go-libp2p/p2p/crypto"

p2p/net/conn/dial_test.go

@@ -13,8 +13,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	tu "util/testutil"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func echoListen(ctx context.Context, listener Listener) {

p2p/net/conn/listen.go

@@ -5,11 +5,11 @@ import (
 	"io"
 	"net"
 
+	"QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
+	goprocessctx "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess/context"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	tec "github.com/jbenet/go-temp-err-catcher"
-	"github.com/jbenet/goprocess"
-	goprocessctx "github.com/jbenet/goprocess/context"
-	context "golang.org/x/net/context"
 
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	filter "github.com/ipfs/go-libp2p/p2p/net/filter"

p2p/net/conn/secure_conn.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"time"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	secio "github.com/ipfs/go-libp2p/p2p/crypto/secio"

p2p/net/conn/secure_conn_test.go

@@ -10,7 +10,7 @@ import (
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	travis "util/testutil/ci/travis"
 
-	context "golang.org/x/net/context"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 )
 
 func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) {

p2p/net/interface.go

@@ -6,9 +6,9 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
+	"QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	"github.com/jbenet/goprocess"
-	context "golang.org/x/net/context"
 )
 
 // MessageSizeMax is a soft (recommended) maximum for network messages.

p2p/net/mock/mock.go

@@ -3,7 +3,7 @@ package mocknet
 import (
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 
-	context "golang.org/x/net/context"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 )
 
 var log = logging.Logger("mocknet")

p2p/net/mock/mock_conn.go

@@ -8,8 +8,8 @@ import (
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
+	process "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	process "github.com/jbenet/goprocess"
 )
 
 // conn represents one side's perspective of a

p2p/net/mock/mock_net.go

@@ -13,10 +13,10 @@ import (
 	p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
 	testutil "util/testutil"
 
+	"QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
+	goprocessctx "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess/context"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	"github.com/jbenet/goprocess"
-	goprocessctx "github.com/jbenet/goprocess/context"
-	context "golang.org/x/net/context"
 )
 
 // mocknet implements mocknet.Mocknet