Merge branch 'poc8' into develop

ethereum · Dec 5, 2014 · f06543f · f06543f
2 parents 9925916 + 195b2d2
commit f06543f
Show file tree

Hide file tree

Showing 22 changed files with 1,985 additions and 2,378 deletions.
diff --git a/p2p/client_identity.go b/p2p/client_identity.go
@@ -5,10 +5,10 @@ import (
 	"runtime"
 )
 
-// should be used in Peer handleHandshake, incorporate Caps, ProtocolVersion, Pubkey etc.
+// ClientIdentity represents the identity of a peer.
 type ClientIdentity interface {
-	String() string
-	Pubkey() []byte
+	String() string // human readable identity
+	Pubkey() []byte // 512-bit public key
 }
 
 type SimpleClientIdentity struct {

diff --git a/p2p/connection.go b/p2p/connection.go