Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
p2p
go-p2p-swarm
Commits
451f36d3
Commit
451f36d3
authored
Apr 27, 2016
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rewrite all package paths to dvcs
parent
b543d963
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
60 additions
and
60 deletions
+60
-60
addr/addr.go
addr/addr.go
+4
-4
addr/addr_test.go
addr/addr_test.go
+2
-2
dial_test.go
dial_test.go
+4
-4
peers_test.go
peers_test.go
+3
-3
simul_test.go
simul_test.go
+3
-3
swarm.go
swarm.go
+13
-13
swarm_addr.go
swarm_addr.go
+1
-1
swarm_addr_test.go
swarm_addr_test.go
+3
-3
swarm_conn.go
swarm_conn.go
+5
-5
swarm_dial.go
swarm_dial.go
+5
-5
swarm_listen.go
swarm_listen.go
+5
-5
swarm_net.go
swarm_net.go
+4
-4
swarm_net_test.go
swarm_net_test.go
+1
-1
swarm_notif_test.go
swarm_notif_test.go
+3
-3
swarm_stream.go
swarm_stream.go
+1
-1
swarm_test.go
swarm_test.go
+3
-3
No files found.
addr/addr.go
View file @
451f36d3
...
...
@@ -3,10 +3,10 @@ package addrutil
import
(
"fmt"
manet
"gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net
"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context
"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
logging
"github.com/ipfs/go-log
"
ma
"github.com/jbenet/go-multiaddr
"
manet
"github.com/jbenet/go-multiaddr-net
"
context
"golang.org/x/net/context
"
)
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
import
(
"testing"
ma
net
"gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb
/go-multiaddr
-net
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz
/go-multiaddr"
ma
"github.com/jbenet
/go-multiaddr"
ma
net
"github.com/jbenet
/go-multiaddr
-net
"
)
func
newMultiaddr(t *testing.T, s
string
) ma.Multiaddr {
...
...
dial_test.go
View file @
451f36d3
...
...
@@ -7,14 +7,14 @@ import (
"testing"
"time"
peer
"github.com/ipfs/go-libp2p-peer"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
testutil
"github.com/ipfs/go-libp2p/testutil"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
ma
net
"gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb
/go-multiaddr
-net
"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/contex
t"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
ma
"github.com/jbenet
/go-multiaddr"
manet
"github.com/jbenet/go-multiaddr-ne
t"
context
"golang.org/x/net/context
"
)
func
closeSwarms(swarms []*Swarm) {
...
...
peers_test.go
View file @
451f36d3
...
...
@@ -3,9 +3,9 @@ package swarm
import
(
"testing"
peer
"g
x/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt
/go-libp2p-peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
peer
"g
ithub.com/ipfs
/go-libp2p-peer"
ma
"github.com/jbenet/go-multiaddr
"
context
"golang.org/x/net/context
"
)
func
TestPeers(t *testing.T) {
...
...
simul_test.go
View file @
451f36d3
...
...
@@ -6,11 +6,11 @@ import (
"testing"
"time"
peer
"github.com/ipfs/go-libp2p-peer"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
ma
"github.com/jbenet/go-multiaddr
"
context
"golang.org/x/net/context
"
)
func
TestSimultOpen(t *testing.T) {
...
...
swarm.go
View file @
451f36d3
...
...
@@ -8,25 +8,25 @@ import (
"sync"
"time"
peer
"github.com/ipfs/go-libp2p-peer"
transport
"github.com/ipfs/go-libp2p-transport"
metrics
"github.com/ipfs/go-libp2p/p2p/metrics"
mconn
"github.com/ipfs/go-libp2p/p2p/metrics/conn"
inet
"github.com/ipfs/go-libp2p/p2p/net"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
filter
"github.com/ipfs/go-libp2p/p2p/net/filter"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
goprocessctx
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
transport
"gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport"
pst
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer"
psmss
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/multistream"
spdy
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/spdystream"
yamux
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/yamux"
ps
"gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
mafilter
"gx/ipfs/Qme8dipKnZAChkp5Kfgj2MYYyBbzjqqPXmxQx3g9v3MoxP/multiaddr-filter"
logging
"github.com/ipfs/go-log"
ma
"github.com/jbenet/go-multiaddr"
ps
"github.com/jbenet/go-peerstream"
pst
"github.com/jbenet/go-stream-muxer"
psmss
"github.com/jbenet/go-stream-muxer/multistream"
spdy
"github.com/jbenet/go-stream-muxer/spdystream"
yamux
"github.com/jbenet/go-stream-muxer/yamux"
"github.com/jbenet/goprocess"
goprocessctx
"github.com/jbenet/goprocess/context"
mafilter
"github.com/whyrusleeping/multiaddr-filter"
context
"golang.org/x/net/context"
)
var
log = logging.Logger(
"swarm2"
)
...
...
swarm_addr.go
View file @
451f36d3
...
...
@@ -4,7 +4,7 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
ma
"g
x/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
)
// ListenAddresses returns a list of addresses at which this swarm listens.
...
...
swarm_addr_test.go
View file @
451f36d3
...
...
@@ -3,13 +3,13 @@ package swarm
import
(
"testing"
peer
"github.com/ipfs/go-libp2p-peer"
metrics
"github.com/ipfs/go-libp2p/p2p/metrics"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
testutil
"github.com/ipfs/go-libp2p/testutil"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
ma
"github.com/jbenet/go-multiaddr
"
context
"golang.org/x/net/context
"
)
func
TestFilterAddrs(t *testing.T) {
...
...
swarm_conn.go
View file @
451f36d3
...
...
@@ -6,11 +6,11 @@ import (
inet
"github.com/ipfs/go-libp2p/p2p/net"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
ic
"g
x/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY
/go-libp2p-crypto"
p
s
"gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream
"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-pee
r"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
ic
"g
ithub.com/ipfs
/go-libp2p-crypto"
p
eer
"github.com/ipfs/go-libp2p-peer
"
ma
"github.com/jbenet/go-multiadd
r"
ps
"github.com/jbenet/go-peerstream
"
context
"golang.org/x/net/context
"
)
// a Conn is a simple wrapper around a ps.Conn that also exposes
...
...
swarm_dial.go
View file @
451f36d3
...
...
@@ -8,13 +8,13 @@ import (
"sync"
"time"
lgbl
"github.com/ipfs/go-libp2p-loggables"
peer
"github.com/ipfs/go-libp2p-peer"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
"gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net"
lgbl
"gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
ma
"github.com/jbenet/go-multiaddr"
"github.com/jbenet/go-multiaddr-net"
context
"golang.org/x/net/context"
)
// Diagram of dial sync:
...
...
swarm_listen.go
View file @
451f36d3
...
...
@@ -3,14 +3,14 @@ package swarm
import
(
"fmt"
lgbl
"github.com/ipfs/go-libp2p-loggables"
transport
"github.com/ipfs/go-libp2p-transport"
mconn
"github.com/ipfs/go-libp2p/p2p/metrics/conn"
inet
"github.com/ipfs/go-libp2p/p2p/net"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
transport
"gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport"
lgbl
"gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables"
ps
"gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
ma
"github.com/jbenet/go-multiaddr"
ps
"github.com/jbenet/go-peerstream"
context
"golang.org/x/net/context"
)
// Open listeners and reuse-dialers for the given addresses
...
...
swarm_net.go
View file @
451f36d3
...
...
@@ -3,13 +3,13 @@ package swarm
import
(
"fmt"
peer
"github.com/ipfs/go-libp2p-peer"
metrics
"github.com/ipfs/go-libp2p/p2p/metrics"
inet
"github.com/ipfs/go-libp2p/p2p/net"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess
"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
ma
"github.com/jbenet/go-multiaddr
"
"github.com/jbenet/goprocess
"
context
"golang.org/x/net/context
"
)
// Network implements the inet.Network interface.
...
...
swarm_net_test.go
View file @
451f36d3
...
...
@@ -7,7 +7,7 @@ import (
inet
"github.com/ipfs/go-libp2p/p2p/net"
testutil
"github.com/ipfs/go-libp2p/p2p/test/util"
context
"g
x/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-
net/context"
context
"g
olang.org/x/
net/context"
)
// TestConnectednessCorrect starts a few networks, connects a few
...
...
swarm_notif_test.go
View file @
451f36d3
...
...
@@ -4,10 +4,10 @@ import (
"testing"
"time"
peer
"github.com/ipfs/go-libp2p-peer"
inet
"github.com/ipfs/go-libp2p/p2p/net"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
ma
"github.com/jbenet/go-multiaddr"
context
"golang.org/x/net/context"
)
func
TestNotifications(t *testing.T) {
...
...
swarm_stream.go
View file @
451f36d3
...
...
@@ -3,7 +3,7 @@ package swarm
import
(
inet
"github.com/ipfs/go-libp2p/p2p/net"
ps
"g
x/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8
/go-peerstream"
ps
"g
ithub.com/jbenet
/go-peerstream"
)
// 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 (
"testing"
"time"
peer
"github.com/ipfs/go-libp2p-peer"
metrics
"github.com/ipfs/go-libp2p/p2p/metrics"
inet
"github.com/ipfs/go-libp2p/p2p/net"
testutil
"github.com/ipfs/go-libp2p/testutil"
peer
"gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context
"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr
"
ma
"github.com/jbenet/go-multiaddr
"
context
"golang.org/x/net/context
"
)
func
EchoStreamHandler(stream inet.Stream) {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment