merge

2015-02-13 16:02:37 +01:00
parent 76fa75b394
commit bde3ff16ad
5 changed files with 17 additions and 893 deletions
--- a/core/manager.go
+++ b/core/manager.go
@ -16,7 +16,6 @@ type EthManager interface {
 	IsListening() bool
 	Peers() []*p2p.Peer
 	KeyManager() *crypto.KeyManager
-	ClientIdentity() p2p.ClientIdentity
 	Db() ethutil.Database
 	EventMux() *event.TypeMux
 }