From 5bf688925038f8527cf1366db4321d47401c8041 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 11 May 2015 11:04:53 +0100 Subject: [PATCH] remove Peer.Version further shrinking the Peer API --- router/peer.go | 6 ------ router/peers.go | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/router/peer.go b/router/peer.go index 1ba834b8..ffe56580 100644 --- a/router/peer.go +++ b/router/peer.go @@ -42,12 +42,6 @@ func (peer *Peer) Info() string { return fmt.Sprint(peer.String(), " (v", peer.version, ") (UID ", peer.UID, ")") } -func (peer *Peer) Version() uint64 { - peer.RLock() - defer peer.RUnlock() - return peer.version -} - func (peer *Peer) Connections() ConnectionSet { connections := make(ConnectionSet) peer.RLock() diff --git a/router/peers.go b/router/peers.go index db7577c5..8362e4bd 100644 --- a/router/peers.go +++ b/router/peers.go @@ -242,7 +242,7 @@ func (peers *Peers) applyUpdate(decodedUpdate []*Peer, decodedConns [][]Connecti // guaranteed to find peer in the peers.table peer := peers.table[name] if peer != newPeer && - (peer == peers.ourself.Peer || peer.Version() >= newPeer.Version()) { + (peer == peers.ourself.Peer || peer.version >= newPeer.version) { // Nobody but us updates us. And if we know more about a // peer than what's in the the update, we ignore the // latter. @@ -259,7 +259,7 @@ func (peers *Peers) applyUpdate(decodedUpdate []*Peer, decodedConns [][]Connecti // router.Peers.ApplyUpdate. But ApplyUpdate takes the Lock on // the router.Peers, so there can be no race here. conns := makeConnsMap(peer, connSummaries, peers.table) - peer.SetVersionAndConnections(newPeer.Version(), conns) + peer.SetVersionAndConnections(newPeer.version, conns) newUpdate[name] = peer } return newUpdate