refactor: simplify NewPeers

This commit is contained in:
Matthias Radestock committed 2015-07-11 17:46:57 +01:00
1 parent 2b61bc91df
commit 7aab5cc5b4
3 files changed
+5 -7

No files matched your search

+2 -5
View File
@@ -39,11 +39,8 @@ type ConnectionSummary struct {
Established bool
}
func NewPeers(ourself *LocalPeer, onGC func(*Peer)) *Peers {
return &Peers{
ourself: ourself,
table: make(map[PeerName]*Peer),
onGC: []func(*Peer){onGC}}
func NewPeers(ourself *LocalPeer) *Peers {
return &Peers{ourself: ourself, table: make(map[PeerName]*Peer)}
}
func (peers *Peers) OnGC(callback func(*Peer)) {
+1 -1
View File
@@ -19,7 +19,7 @@ import (
func newNode(name PeerName) (*Peer, *Peers) {
peer := NewLocalPeer(name, "", nil)
peers := NewPeers(peer, func(*Peer) {})
peers := NewPeers(peer)
peers.FetchWithDefault(peer.Peer)
return peer.Peer, peers
}
+2 -1
View File
@@ -74,7 +74,8 @@ func NewRouter(config Config, name PeerName, nickName string) *Router {
}
router.Ourself = NewLocalPeer(name, nickName, router)
router.Macs = NewMacCache(macMaxAge, onMacExpiry)
router.Peers = NewPeers(router.Ourself, onPeerGC)
router.Peers = NewPeers(router.Ourself)
router.Peers.OnGC(onPeerGC)
router.Peers.FetchWithDefault(router.Ourself.Peer)
router.Routes = NewRoutes(router.Ourself, router.Peers)
router.ConnectionMaker = NewConnectionMaker(router.Ourself, router.Peers, router.Port, router.PeerDiscovery)