remove handshake for now (need to merge and move)
Juan Batiz-Benet committed
Sep 14, 2014 at 00:28 UTC
a273a03efc3da8f5c281e8ef1298d65ed445f28f
2 files changed
+5
-11
net/swarm/conn.go
+4
-4
@@ -103,10 +103,10 @@ func (s *Swarm) connSetup(c *conn.Conn) error {
103
104
u.DOut("Starting connection: %s\n", c.Peer.Key().Pretty())
105
106
- // handshake
107
- if err := s.connHandshake(c); err != nil {
108
- return fmt.Errorf("Conn handshake error: %v", err)
109
- }
106
+ // handshake TODO(jbenet) enable handshake
107
+ // if err := s.connHandshake(c); err != nil {
108
+ // return fmt.Errorf("Conn handshake error: %v", err)
109
+ // }
110
111
// add to conns
112
s.connsLock.Lock()
net/swarm/swarm_test.go
+1
-7
@@ -19,7 +19,6 @@ func pingListen(t *testing.T, listener *net.TCPListener, peer *peer.Peer) {
19
for {
20
c, err := listener.Accept()
21
if err == nil {
22
- fmt.Println("accepted")
22
go pong(t, c, peer)
23
}
24
}
@@ -78,10 +77,10 @@ func TestSwarm(t *testing.T) {
77
var peers []*peer.Peer
78
var listeners []net.Listener
79
peerNames := map[string]string{
81
- "11140beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a30": "/ip4/127.0.0.1/tcp/1234",
80
"11140beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a31": "/ip4/127.0.0.1/tcp/2345",
81
"11140beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a32": "/ip4/127.0.0.1/tcp/3456",
82
"11140beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33": "/ip4/127.0.0.1/tcp/4567",
83
+ "11140beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a34": "/ip4/127.0.0.1/tcp/5678",
84
}
85
86
for k, n := range peerNames {
@@ -103,13 +102,11 @@ func TestSwarm(t *testing.T) {
102
}
103
go pingListen(t, listener.(*net.TCPListener), peer)
104
106
- u.POut("wat?\n")
105
_, err = swarm.Dial(peer)
106
if err != nil {
107
t.Fatal("error swarm dialing to peer", err)
108
}
109
112
- u.POut("wut?\n")
110
// ok done, add it.
111
peers = append(peers, peer)
112
listeners = append(listeners, listener)
@@ -119,14 +116,12 @@ func TestSwarm(t *testing.T) {
116
for k := 0; k < MsgNum; k++ {
117
for _, p := range peers {
118
swarm.Outgoing <- &msg.Message{Peer: p, Data: []byte("ping")}
122
- u.POut("sending ping to %v\n", p)
119
}
120
}
121
122
got := map[u.Key]int{}
123
124
for k := 0; k < (MsgNum * len(peers)); k++ {
129
- u.POut("listening for ping...")
125
msg := <-swarm.Incoming
126
if string(msg.Data) != "pong" {
127
t.Error("unexpected conn output", msg.Data)
@@ -146,7 +141,6 @@ func TestSwarm(t *testing.T) {
141
}
142
}
143
149
- fmt.Println("closing")
144
swarm.Close()
145
for _, listener := range listeners {
146
listener.(*net.TCPListener).Close()