Merge branch 'develop' of github.com:ethereum/eth-go into develop

2014-05-14 13:57:08 +02:00
parent 3ac74b1e78 f4fa0d48cb
commit ff2cf2dacd
9 changed files with 122 additions and 118 deletions
--- a/peer.go
+++ b/peer.go
@ -583,8 +583,8 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
 		p.port = uint16(c.Get(4).Uint())

 		// Self connect detection
-		key := ethutil.Config.Db.GetKeys()[0]
-		if bytes.Compare(key.PublicKey, p.pubkey) == 0 {
+		keyPair := ethutil.GetKeyRing().Get(0)
+		if bytes.Compare(keyPair.PublicKey, p.pubkey) == 0 {
 			p.Stop()

 			return