Skip to content

GitLab

Commit 451f36d3 authored by Jeromy's avatar Jeromy
Browse files
Options

rewrite all package paths to dvcs

parent b543d963
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 60 deletions
addr/addr.go
View file @ 451f36d3
...@@ -3,10 +3,10 @@ package addrutil ...@@ -3,10 +3,10 @@ package addrutil
import ( import (
"fmt" "fmt"
manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" logging "github.com/ipfs/go-log"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" manet "github.com/jbenet/go-multiaddr-net"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" 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")
......
addr/addr_test.go
View file @ 451f36d3
...@@ -3,8 +3,8 @@ package addrutil ...@@ -3,8 +3,8 @@ package addrutil
import ( import (
"testing" "testing"
manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/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 {
......
dial_test.go
View file @ 451f36d3
...@@ -7,14 +7,14 @@ import ( ...@@ -7,14 +7,14 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
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"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" manet "github.com/jbenet/go-multiaddr-net"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
func closeSwarms(swarms []*Swarm) { func closeSwarms(swarms []*Swarm) {
......
peers_test.go
View file @ 451f36d3
...@@ -3,9 +3,9 @@ package swarm ...@@ -3,9 +3,9 @@ package swarm
import ( import (
"testing" "testing"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" peer "github.com/ipfs/go-libp2p-peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
func TestPeers(t *testing.T) { func TestPeers(t *testing.T) {
......
simul_test.go
View file @ 451f36d3
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
ci "github.com/ipfs/go-libp2p/testutil/ci" ci "github.com/ipfs/go-libp2p/testutil/ci"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
func TestSimultOpen(t *testing.T) { func TestSimultOpen(t *testing.T) {
......
swarm.go
View file @ 451f36d3
...@@ -8,25 +8,25 @@ import ( ...@@ -8,25 +8,25 @@ import (
"sync" "sync"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
transport "github.com/ipfs/go-libp2p-transport"
metrics "github.com/ipfs/go-libp2p/p2p/metrics" metrics "github.com/ipfs/go-libp2p/p2p/metrics"
mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn" mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
filter "github.com/ipfs/go-libp2p/p2p/net/filter" filter "github.com/ipfs/go-libp2p/p2p/net/filter"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" logging "github.com/ipfs/go-log"
goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" ma "github.com/jbenet/go-multiaddr"
transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" ps "github.com/jbenet/go-peerstream"
pst "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer" pst "github.com/jbenet/go-stream-muxer"
psmss "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/multistream" psmss "github.com/jbenet/go-stream-muxer/multistream"
spdy "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/spdystream" spdy "github.com/jbenet/go-stream-muxer/spdystream"
yamux "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/yamux" yamux "github.com/jbenet/go-stream-muxer/yamux"
ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream" "github.com/jbenet/goprocess"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" goprocessctx "github.com/jbenet/goprocess/context"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" mafilter "github.com/whyrusleeping/multiaddr-filter"
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" context "golang.org/x/net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
mafilter "gx/ipfs/Qme8dipKnZAChkp5Kfgj2MYYyBbzjqqPXmxQx3g9v3MoxP/multiaddr-filter"
) )
var log = logging.Logger("swarm2") var log = logging.Logger("swarm2")
......
swarm_addr.go
View file @ 451f36d3
...@@ -4,7 +4,7 @@ import ( ...@@ -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/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/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.
......
swarm_addr_test.go
View file @ 451f36d3
...@@ -3,13 +3,13 @@ package swarm ...@@ -3,13 +3,13 @@ package swarm
import ( import (
"testing" "testing"
peer "github.com/ipfs/go-libp2p-peer"
metrics "github.com/ipfs/go-libp2p/p2p/metrics" metrics "github.com/ipfs/go-libp2p/p2p/metrics"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
func TestFilterAddrs(t *testing.T) { func TestFilterAddrs(t *testing.T) {
......
swarm_conn.go
View file @ 451f36d3
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" ic "github.com/ipfs/go-libp2p-crypto"
ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream" peer "github.com/ipfs/go-libp2p-peer"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ma "github.com/jbenet/go-multiaddr"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ps "github.com/jbenet/go-peerstream"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" 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
......
swarm_dial.go
View file @ 451f36d3
...@@ -8,13 +8,13 @@ import ( ...@@ -8,13 +8,13 @@ import (
"sync" "sync"
"time" "time"
lgbl "github.com/ipfs/go-libp2p-loggables"
peer "github.com/ipfs/go-libp2p-peer"
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"
"gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" "github.com/jbenet/go-multiaddr-net"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" context "golang.org/x/net/context"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
// Diagram of dial sync: // Diagram of dial sync:
......
swarm_listen.go
View file @ 451f36d3
...@@ -3,14 +3,14 @@ package swarm ...@@ -3,14 +3,14 @@ package swarm
import ( import (
"fmt" "fmt"
lgbl "github.com/ipfs/go-libp2p-loggables"
transport "github.com/ipfs/go-libp2p-transport"
mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn" mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" ma "github.com/jbenet/go-multiaddr"
lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" ps "github.com/jbenet/go-peerstream"
ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream" context "golang.org/x/net/context"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
// Open listeners and reuse-dialers for the given addresses // Open listeners and reuse-dialers for the given addresses
......
swarm_net.go
View file @ 451f36d3
...@@ -3,13 +3,13 @@ package swarm ...@@ -3,13 +3,13 @@ package swarm
import ( import (
"fmt" "fmt"
peer "github.com/ipfs/go-libp2p-peer"
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 "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" ma "github.com/jbenet/go-multiaddr"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" "github.com/jbenet/goprocess"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
// Network implements the inet.Network interface. // Network implements the inet.Network interface.
......
swarm_net_test.go
View file @ 451f36d3
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
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 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" context "golang.org/x/net/context"
) )
// TestConnectednessCorrect starts a few networks, connects a few // TestConnectednessCorrect starts a few networks, connects a few
......
swarm_notif_test.go
View file @ 451f36d3
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ma "github.com/jbenet/go-multiaddr"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" context "golang.org/x/net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
func TestNotifications(t *testing.T) { func TestNotifications(t *testing.T) {
......
swarm_stream.go
View file @ 451f36d3
...@@ -3,7 +3,7 @@ package swarm ...@@ -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/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/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
......
swarm_test.go
View file @ 451f36d3
...@@ -9,13 +9,13 @@ import ( ...@@ -9,13 +9,13 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
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"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
func EchoStreamHandler(stream inet.Stream) { func EchoStreamHandler(stream inet.Stream) {
......
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