aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-13 23:08:30 +0800
committerobscuren <geffobscura@gmail.com>2015-02-13 23:08:30 +0800
commit5c251b69282b3992512d0c17ed0063f294a0e663 (patch)
tree7842c1a6ac8394e8bebfd4f27c9222b497aaf0f6 /xeth
parent75d164037fb9bbf75def7c5501727fd634ef124f (diff)
parentbde3ff16ad98cb4ab0befc899f7f0584d21ff9a4 (diff)
downloadgo-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.gz
go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.zst
go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.zip
Merge branch 'fjl-poc8-net-integration' into develop
Diffstat (limited to 'xeth')
-rw-r--r--xeth/types.go2
-rw-r--r--xeth/xeth.go1
2 files changed, 1 insertions, 2 deletions
diff --git a/xeth/types.go b/xeth/types.go
index 1bab1e1b3..b13317b03 100644
--- a/xeth/types.go
+++ b/xeth/types.go
@@ -215,7 +215,7 @@ func NewPeer(peer *p2p.Peer) *Peer {
return &Peer{
ref: peer,
Ip: fmt.Sprintf("%v", peer.RemoteAddr()),
- Version: fmt.Sprintf("%v", peer.Identity()),
+ Version: fmt.Sprintf("%v", peer.ID()),
Caps: fmt.Sprintf("%v", caps),
}
}
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 4098daf98..75d83f80b 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -31,7 +31,6 @@ type Backend interface {
IsListening() bool
Peers() []*p2p.Peer
KeyManager() *crypto.KeyManager
- ClientIdentity() p2p.ClientIdentity
Db() ethutil.Database
EventMux() *event.TypeMux
Whisper() *whisper.Whisper