p2p: integrate p2p/discover

Overview of changes:

- ClientIdentity has been removed, use discover.NodeID
- Server now requires a private key to be set (instead of public key)
- Server performs the encryption handshake before launching Peer
- Dial logic takes peers from discover table
- Encryption handshake code has been cleaned up a bit
- baseProtocol is gone because we don't exchange peers anymore
- Some parts of baseProtocol have moved into Peer instead

1 files changed, 27 insertions, 29 deletions

diff --git a/p2p/peer_error.go b/p2p/peer_error.go
index 0eb7ec838..9133768f9 100644
--- a/p2p/peer_error.go
+++ b/p2p/peer_error.go
@@ -12,7 +12,6 @@ const (
 	errInvalidMsgCode
 	errInvalidMsg
 	errP2PVersionMismatch
-	errPubkeyMissing
 	errPubkeyInvalid
 	errPubkeyForbidden
 	errProtocolBreach
@@ -22,20 +21,19 @@ const (
 )
 
 var errorToString = map[int]string{
-	errMagicTokenMismatch:     "Magic token mismatch",
-	errRead:                   "Read error",
-	errWrite:                  "Write error",
-	errMisc:                   "Misc error",
-	errInvalidMsgCode:         "Invalid message code",
-	errInvalidMsg:             "Invalid message",
+	errMagicTokenMismatch:     "magic token mismatch",
+	errRead:                   "read error",
+	errWrite:                  "write error",
+	errMisc:                   "misc error",
+	errInvalidMsgCode:         "invalid message code",
+	errInvalidMsg:             "invalid message",
 	errP2PVersionMismatch:     "P2P Version Mismatch",
-	errPubkeyMissing:          "Public key missing",
-	errPubkeyInvalid:          "Public key invalid",
-	errPubkeyForbidden:        "Public key forbidden",
-	errProtocolBreach:         "Protocol Breach",
-	errPingTimeout:            "Ping timeout",
-	errInvalidNetworkId:       "Invalid network id",
-	errInvalidProtocolVersion: "Invalid protocol version",
+	errPubkeyInvalid:          "public key invalid",
+	errPubkeyForbidden:        "public key forbidden",
+	errProtocolBreach:         "protocol Breach",
+	errPingTimeout:            "ping timeout",
+	errInvalidNetworkId:       "invalid network id",
+	errInvalidProtocolVersion: "invalid protocol version",
 }
 
 type peerError struct {
@@ -62,22 +60,22 @@ func (self *peerError) Error() string {
 type DiscReason byte
 
 const (
-	DiscRequested           DiscReason = 0x00
-	DiscNetworkError                   = 0x01
-	DiscProtocolError                  = 0x02
-	DiscUselessPeer                    = 0x03
-	DiscTooManyPeers                   = 0x04
-	DiscAlreadyConnected               = 0x05
-	DiscIncompatibleVersion            = 0x06
-	DiscInvalidIdentity                = 0x07
-	DiscQuitting                       = 0x08
-	DiscUnexpectedIdentity             = 0x09
-	DiscSelf                           = 0x0a
-	DiscReadTimeout                    = 0x0b
-	DiscSubprotocolError               = 0x10
+	DiscRequested DiscReason = iota
+	DiscNetworkError
+	DiscProtocolError
+	DiscUselessPeer
+	DiscTooManyPeers
+	DiscAlreadyConnected
+	DiscIncompatibleVersion
+	DiscInvalidIdentity
+	DiscQuitting
+	DiscUnexpectedIdentity
+	DiscSelf
+	DiscReadTimeout
+	DiscSubprotocolError
 )
 
-var discReasonToString = [DiscSubprotocolError + 1]string{
+var discReasonToString = [...]string{
 	DiscRequested:           "Disconnect requested",
 	DiscNetworkError:        "Network error",
 	DiscProtocolError:       "Breach of protocol",
@@ -117,7 +115,7 @@ func discReasonForError(err error) DiscReason {
 	switch peerError.Code {
 	case errP2PVersionMismatch:
 		return DiscIncompatibleVersion
-	case errPubkeyMissing, errPubkeyInvalid:
+	case errPubkeyInvalid:
 		return DiscInvalidIdentity
 	case errPubkeyForbidden:
 		return DiscUselessPeer