Parallel syntax change; SecretConnection implements net.Conn

p2p/peer.go

@@ -27,10 +27,12 @@ func peerHandshake(conn net.Conn, ourNodeInfo *types.NodeInfo) (*types.NodeInfo,
 	var peerNodeInfo = new(types.NodeInfo)
 	var err1 error
 	var err2 error
-	Parallel(func() {
+	Parallel(
+		func() {
 			var n int64
 			binary.WriteBinary(ourNodeInfo, conn, &n, &err1)
-	}, func() {
+		},
+		func() {
 			var n int64
 			binary.ReadBinary(peerNodeInfo, conn, &n, &err2)
 			log.Info("Peer handshake", "peerNodeInfo", peerNodeInfo)

p2p/secret_connection.go

@@ -7,6 +7,8 @@ import (
 	"crypto/sha256"
 	"encoding/binary"
 	"errors"
+	"net"
+	"time"
 	//"fmt"
 	"io"
 	"sync"
@@ -17,6 +19,7 @@ import (
 
 	acm "github.com/tendermint/tendermint/account"
 	bm "github.com/tendermint/tendermint/binary"
+	. "github.com/tendermint/tendermint/common"
 )
 
 // 2 + 1024 == 1026 total frame size
@@ -25,6 +28,7 @@ const dataMaxSize = 1024
 const totalFrameSize = dataMaxSize + dataLenSize
 const sealedFrameSize = totalFrameSize + secretbox.Overhead
 
+// Implements net.Conn
 type SecretConnection struct {
 	conn       io.ReadWriteCloser
 	recvBuffer []byte
@@ -157,8 +161,16 @@ func (sc *SecretConnection) Read(data []byte) (n int, err error) {
 	return
 }
 
-func (sc *SecretConnection) Close() error {
+// Implements net.Conn
-	return sc.conn.Close()
+func (sc *SecretConnection) Close() error                  { return sc.conn.Close() }
+func (sc *SecretConnection) LocalAddr() net.Addr           { return sc.conn.(net.Conn).LocalAddr() }
+func (sc *SecretConnection) RemoteAddr() net.Addr          { return sc.conn.(net.Conn).RemoteAddr() }
+func (sc *SecretConnection) SetDeadline(t time.Time) error { return sc.conn.(net.Conn).SetDeadline(t) }
+func (sc *SecretConnection) SetReadDeadline(t time.Time) error {
+	return sc.conn.(net.Conn).SetReadDeadline(t)
+}
+func (sc *SecretConnection) SetWriteDeadline(t time.Time) error {
+	return sc.conn.(net.Conn).SetWriteDeadline(t)
 }
 
 func genEphKeys() (ephPub, ephPriv *[32]byte) {
@@ -246,17 +258,13 @@ type authSigMessage struct {
 func shareAuthSignature(sc *SecretConnection, pubKey acm.PubKeyEd25519, signature acm.SignatureEd25519) (acm.PubKeyEd25519, acm.SignatureEd25519, error) {
 	var recvMsg authSigMessage
 	var err1, err2 error
-	var wg sync.WaitGroup
-	wg.Add(2)
 
-	go func() {
+	Parallel(
-		defer wg.Done()
+		func() {
 			msgBytes := bm.BinaryBytes(authSigMessage{pubKey, signature})
 			_, err1 = sc.Write(msgBytes)
-	}()
+		},
-
+		func() {
-	go func() {
-		defer wg.Done()
 			// NOTE relies on atomicity of small data.
 			readBuffer := make([]byte, dataMaxSize)
 			_, err2 = sc.Read(readBuffer)
@@ -265,9 +273,8 @@ func shareAuthSignature(sc *SecretConnection, pubKey acm.PubKeyEd25519, signatur
 			}
 			n := int64(0) // not used.
 			recvMsg = bm.ReadBinary(authSigMessage{}, bytes.NewBuffer(readBuffer), &n, &err2).(authSigMessage)
-	}()
+		})
 
-	wg.Wait()
 	if err1 != nil {
 		return nil, nil, err1
 	}

p2p/secret_connection_test.go

@@ -37,7 +37,8 @@ func makeSecretConnPair(tb testing.TB) (fooSecConn, barSecConn *SecretConnection
 	barPrvKey := acm.PrivKeyEd25519(CRandBytes(32))
 	barPubKey := barPrvKey.PubKey().(acm.PubKeyEd25519)
 
-	Parallel(func() {
+	Parallel(
+		func() {
 			var err error
 			fooSecConn, err = MakeSecretConnection(fooConn, fooPrvKey)
 			if err != nil {
@@ -48,7 +49,8 @@ func makeSecretConnPair(tb testing.TB) (fooSecConn, barSecConn *SecretConnection
 				tb.Errorf("Unexpected fooSecConn.RemotePubKey.  Expected %v, got %v",
 					barPubKey, fooSecConn.RemotePubKey())
 			}
-	}, func() {
+		},
+		func() {
 			var err error
 			barSecConn, err = MakeSecretConnection(barConn, barPrvKey)
 			if barSecConn == nil {
@@ -92,7 +94,8 @@ func TestSecretConnectionReadWrite(t *testing.T) {
 				return
 			}
 			// In parallel, handle reads and writes
-			Parallel(func() {
+			Parallel(
+				func() {
 					// Node writes
 					for _, nodeWrite := range nodeWrites {
 						n, err := nodeSecretConn.Write([]byte(nodeWrite))
@@ -106,7 +109,8 @@ func TestSecretConnectionReadWrite(t *testing.T) {
 						}
 					}
 					nodeConn.PipeWriter.Close()
-			}, func() {
+				},
+				func() {
 					// Node reads
 					readBuffer := make([]byte, dataMaxSize)
 					for {