forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/simulation: Network.PivotNodeID() to GetPivotNode()

Browse source 
Functions on Network struct return *Node and not enode.ID in general.
Let's keep the interface consistent.
This commit is contained in:
Ferenc Szabo 2018-12-14 15:14:35 +01:00
parent fc086dcd80
commit 8a15a4405d
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
p2p/simulations/connect.go
View file

@ -33,11 +33,11 @@ var (
// It is useful when constructing a star network topology // It is useful when constructing a star network topology
// when Network adds and removes nodes dynamically. // when Network adds and removes nodes dynamically.
func (net *Network) ConnectToPivotNode(id enode.ID) (err error) { func (net *Network) ConnectToPivotNode(id enode.ID) (err error) {
pivot := net.PivotNodeID() pivot := net.GetPivotNode()
if pivot == nil { if pivot == nil {
return ErrNoPivotNode return ErrNoPivotNode
} }
return net.connect(*pivot, id) return net.connect(pivot.ID(), id)
} }
// ConnectToLastNode connects the node with provided NodeID // ConnectToLastNode connects the node with provided NodeID
@ -146,11 +146,11 @@ func (net *Network) ConnectNodesStar(id enode.ID, ids []enode.ID) (err error) {
// with the center at already set pivot node. // with the center at already set pivot node.
// If ids argument is nil, all nodes that are up will be connected. // If ids argument is nil, all nodes that are up will be connected.
func (net *Network) ConnectNodesStarPivot(ids []enode.ID) (err error) { func (net *Network) ConnectNodesStarPivot(ids []enode.ID) (err error) {
pivot := net.PivotNodeID() pivot := net.GetPivotNode()
if pivot == nil { if pivot == nil {
return ErrNoPivotNode return ErrNoPivotNode
} }
return net.ConnectNodesStar(*pivot, ids) return net.ConnectNodesStar(pivot.ID(), ids)
} }
// connect connects two nodes but ignores already connected error. // connect connects two nodes but ignores already connected error.
@ -168,18 +168,18 @@ func ignoreAlreadyConnectedErr(err error) error {
// SetPivotNode sets the NodeID of the network's pivot node. // SetPivotNode sets the NodeID of the network's pivot node.
// Pivot node is just a specific node that should be treated // Pivot node is just a specific node that should be treated
// differently then other nodes in test. SetPivotNode and // differently then other nodes in test. SetPivotNode and
// PivotNodeID are just a convenient functions to set and // GetPivotNode are just a convenient functions to set and
// retrieve it. // retrieve it.
func (net *Network) SetPivotNode(id enode.ID) { func (net *Network) SetPivotNode(id enode.ID) {
net.lock.Lock() net.lock.Lock()
defer net.lock.Unlock() defer net.lock.Unlock()
net.pivotNodeID = &id net.pivotNodeID = id
} }
// PivotNodeID returns NodeID of the pivot node set by // GetPivotNode returns NodeID of the pivot node set by
// Network.SetPivotNode method. // Network.SetPivotNode method.
func (net *Network) PivotNodeID() (id *enode.ID) { func (net *Network) GetPivotNode() (node *Node) {
net.lock.RLock() net.lock.RLock()
defer net.lock.RUnlock() defer net.lock.RUnlock()
return net.pivotNodeID return net.getNode(net.pivotNodeID)
} }

2
p2p/simulations/network.go
View file

@ -58,7 +58,7 @@ type Network struct {
Conns []*Conn `json:"conns"` Conns []*Conn `json:"conns"`
connMap map[string]int connMap map[string]int
pivotNodeID *enode.ID pivotNodeID enode.ID
nodeAdapter adapters.NodeAdapter nodeAdapter adapters.NodeAdapter
events event.Feed events event.Feed