This commit is contained in:
Jeromy
2015-12-06 23:00:10 -08:00
parent a478405a42
commit 2d1b1db0e4
16 changed files with 43 additions and 43 deletions

View File

@@ -3,11 +3,11 @@ package addrutil
import ( import (
"fmt" "fmt"
logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" logging "github.com/ipfs/go-log"
manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" manet "github.com/jbenet/go-multiaddr-net"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/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")

View File

@@ -3,8 +3,8 @@ package addrutil
import ( import (
"testing" "testing"
manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" manet "github.com/jbenet/go-multiaddr-net"
) )
func newMultiaddr(t *testing.T, s string) ma.Multiaddr { func newMultiaddr(t *testing.T, s string) ma.Multiaddr {

View File

@@ -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"
manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" manet "github.com/jbenet/go-multiaddr-net"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
func acceptAndHang(l net.Listener) { func acceptAndHang(l net.Listener) {

View File

@@ -5,8 +5,8 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
func TestPeers(t *testing.T) { func TestPeers(t *testing.T) {

View File

@@ -9,8 +9,8 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ci "github.com/ipfs/go-libp2p/testutil/ci" ci "github.com/ipfs/go-libp2p/testutil/ci"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
func TestSimultOpen(t *testing.T) { func TestSimultOpen(t *testing.T) {

View File

@@ -16,16 +16,16 @@ 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"
ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" ma "github.com/jbenet/go-multiaddr"
pst "gx/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC/go-stream-muxer" ps "github.com/jbenet/go-peerstream"
psmss "gx/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC/go-stream-muxer/multistream" pst "github.com/jbenet/go-stream-muxer"
mafilter "gx/QmVCmuhgDFer5MW5737Z8GtBEGpUyEkFnLUv4ASDWnLZdC/multiaddr-filter" psmss "github.com/jbenet/go-stream-muxer/multistream"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" "github.com/jbenet/goprocess"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" goprocessctx "github.com/jbenet/goprocess/context"
"gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess" mafilter "github.com/whyrusleeping/multiaddr-filter"
goprocessctx "gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess/context" context "golang.org/x/net/context"
logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" logging "github.com/ipfs/go-log"
) )
var log = logging.Logger("swarm2") var log = logging.Logger("swarm2")

View File

@@ -4,7 +4,7 @@ import (
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
) )
// ListenAddresses returns a list of addresses at which this swarm listens. // ListenAddresses returns a list of addresses at which this swarm listens.

View File

@@ -8,8 +8,8 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
func TestFilterAddrs(t *testing.T) { func TestFilterAddrs(t *testing.T) {

View File

@@ -8,9 +8,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"
ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" ma "github.com/jbenet/go-multiaddr"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ps "github.com/jbenet/go-peerstream"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
// a Conn is a simple wrapper around a ps.Conn that also exposes // a Conn is a simple wrapper around a ps.Conn that also exposes

View File

@@ -12,10 +12,10 @@ import (
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
"gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" "github.com/jbenet/go-multiaddr-net"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
// Diagram of dial sync: // Diagram of dial sync:

View File

@@ -9,9 +9,9 @@ import (
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
transport "github.com/ipfs/go-libp2p/p2p/net/transport" transport "github.com/ipfs/go-libp2p/p2p/net/transport"
ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" ma "github.com/jbenet/go-multiaddr"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ps "github.com/jbenet/go-peerstream"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
// Open listeners and reuse-dialers for the given addresses // Open listeners and reuse-dialers for the given addresses

View File

@@ -8,9 +8,9 @@ import (
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"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" "github.com/jbenet/goprocess"
"gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess" context "golang.org/x/net/context"
) )
// Network implements the inet.Network interface. // Network implements the inet.Network interface.

View File

@@ -5,9 +5,9 @@ import (
"testing" "testing"
"time" "time"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
testutil "github.com/ipfs/go-libp2p/p2p/test/util" testutil "github.com/ipfs/go-libp2p/p2p/test/util"
context "golang.org/x/net/context"
) )
// TestConnectednessCorrect starts a few networks, connects a few // TestConnectednessCorrect starts a few networks, connects a few

View File

@@ -4,8 +4,8 @@ import (
"testing" "testing"
"time" "time"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" 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"

View File

@@ -3,7 +3,7 @@ package swarm
import ( import (
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" ps "github.com/jbenet/go-peerstream"
) )
// a Stream is a wrapper around a ps.Stream that exposes a way to get // a Stream is a wrapper around a ps.Stream that exposes a way to get

View File

@@ -14,8 +14,8 @@ import (
peer "github.com/ipfs/go-libp2p/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" context "golang.org/x/net/context"
) )
func EchoStreamHandler(stream inet.Stream) { func EchoStreamHandler(stream inet.Stream) {