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
a4d14e53
Commit
a4d14e53
authored
Mar 03, 2016
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update version of go-multiaddr
parent
91190d3c
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
23 additions
and
29 deletions
+23
-29
addr/addr.go
addr/addr.go
+3
-4
addr/addr_test.go
addr/addr_test.go
+2
-2
dial_test.go
dial_test.go
+2
-2
peers_test.go
peers_test.go
+1
-2
simul_test.go
simul_test.go
+2
-2
swarm.go
swarm.go
+2
-3
swarm_addr.go
swarm_addr.go
+1
-1
swarm_addr_test.go
swarm_addr_test.go
+1
-1
swarm_conn.go
swarm_conn.go
+1
-1
swarm_dial.go
swarm_dial.go
+2
-3
swarm_listen.go
swarm_listen.go
+2
-3
swarm_net.go
swarm_net.go
+1
-1
swarm_notif_test.go
swarm_notif_test.go
+2
-3
swarm_test.go
swarm_test.go
+1
-1
No files found.
addr/addr.go
View file @
a4d14e53
...
...
@@ -3,11 +3,10 @@ package addrutil
import
(
"fmt"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet
"gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
manet
"gx/ipfs/QmQB7mNP3QE7b4zP2MQmsyJDqG5hzYE2CL8k1VyLWky2Ed/go-multiaddr-net"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
var
log
=
logging
.
Logger
(
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
)
...
...
addr/addr_test.go
View file @
a4d14e53
...
...
@@ -3,8 +3,8 @@ package addrutil
import
(
"testing"
ma
"gx/ipfs/Qm
R3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV
/go-multiaddr"
ma
net
"gx/ipfs/Qm
YtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi
/go-multiaddr
-net
"
ma
net
"gx/ipfs/Qm
QB7mNP3QE7b4zP2MQmsyJDqG5hzYE2CL8k1VyLWky2Ed
/go-multiaddr
-net
"
ma
"gx/ipfs/Qm
cobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz
/go-multiaddr"
)
func
newMultiaddr
(
t
*
testing
.
T
,
s
string
)
ma
.
Multiaddr
{
...
...
dial_test.go
View file @
a4d14e53
...
...
@@ -13,9 +13,9 @@ import (
testutil
"github.com/ipfs/go-libp2p/testutil"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet
"gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
manet
"gx/ipfs/QmQB7mNP3QE7b4zP2MQmsyJDqG5hzYE2CL8k1VyLWky2Ed/go-multiaddr-net"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
func
acceptAndHang
(
l
net
.
Listener
)
{
...
...
peers_test.go
View file @
a4d14e53
...
...
@@ -5,12 +5,11 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
func
TestPeers
(
t
*
testing
.
T
)
{
// t.Skip("skipping for another test")
ctx
:=
context
.
Background
()
swarms
:=
makeSwarms
(
ctx
,
t
,
2
)
...
...
simul_test.go
View file @
a4d14e53
...
...
@@ -9,12 +9,12 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
func
TestSimultOpen
(
t
*
testing
.
T
)
{
// t.Skip("skipping for another test")
t
.
Parallel
()
ctx
:=
context
.
Background
()
...
...
swarm.go
View file @
a4d14e53
...
...
@@ -19,13 +19,12 @@ import (
ps
"gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
goprocessctx
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
pst
"gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer"
psmss
"gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer/multistream"
mafilter
"gx/ipfs/QmW3Q7RQa8D1qCEEeyKCBV1drgFxvHBqAZ3zgCujEwKpHD/multiaddr-filter"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
mafilter
"gx/ipfs/QmcR6dLYF8Eozaae3wGd5wjq76bofzmmbvQmtwobxvfhEt/multiaddr-filter"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
var
log
=
logging
.
Logger
(
"swarm2"
)
...
...
swarm_addr.go
View file @
a4d14e53
...
...
@@ -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
"gx/ipfs/Qm
R3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV
/go-multiaddr"
ma
"gx/ipfs/Qm
cobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz
/go-multiaddr"
)
// ListenAddresses returns a list of addresses at which this swarm listens.
...
...
swarm_addr_test.go
View file @
a4d14e53
...
...
@@ -8,8 +8,8 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
testutil
"github.com/ipfs/go-libp2p/testutil"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
func
TestFilterAddrs
(
t
*
testing
.
T
)
{
...
...
swarm_conn.go
View file @
a4d14e53
...
...
@@ -9,8 +9,8 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ps
"gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
// a Conn is a simple wrapper around a ps.Conn that also exposes
...
...
swarm_dial.go
View file @
a4d14e53
...
...
@@ -12,10 +12,9 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
"gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
"gx/ipfs/QmQB7mNP3QE7b4zP2MQmsyJDqG5hzYE2CL8k1VyLWky2Ed/go-multiaddr-net"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
// Diagram of dial sync:
...
...
swarm_listen.go
View file @
a4d14e53
...
...
@@ -10,11 +10,10 @@ import (
transport
"github.com/ipfs/go-libp2p/p2p/net/transport"
ps
"gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
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
func
(
s
*
Swarm
)
setupInterfaces
(
addrs
[]
ma
.
Multiaddr
)
error
{
errs
:=
make
([]
error
,
len
(
addrs
))
var
succeeded
int
...
...
swarm_net.go
View file @
a4d14e53
...
...
@@ -9,8 +9,8 @@ import (
inet
"github.com/ipfs/go-libp2p/p2p/net"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
// Network implements the inet.Network interface.
...
...
swarm_notif_test.go
View file @
a4d14e53
...
...
@@ -4,11 +4,10 @@ import (
"testing"
"time"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
inet
"github.com/ipfs/go-libp2p/p2p/net"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
func
TestNotifications
(
t
*
testing
.
T
)
{
...
...
swarm_test.go
View file @
a4d14e53
...
...
@@ -14,8 +14,8 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
testutil
"github.com/ipfs/go-libp2p/testutil"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
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