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/simulations: unexport getUpNodeIDs() and getDownNodeIDs()

Browse source 
As they are only used in the same package.
This commit is contained in:
Ferenc Szabo 2018-12-14 14:15:37 +01:00
parent 824d952ac7
commit bba796bc62
2 changed files with 31 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
p2p/simulations/connect.go
View file

@ -45,7 +45,7 @@ func (net *Network) ConnectToPivotNode(id enode.ID) (err error) {
// It is useful when constructing a chain network topology
// when Network adds and removes nodes dynamically.
func (net *Network) ConnectToLastNode(id enode.ID) (err error) {
ids := net.GetUpNodeIDs()
ids := net.getUpNodeIDs()
l := len(ids)
if l < 2 {
return nil
@ -73,7 +73,7 @@ func (net *Network) ConnectToRandomNode(id enode.ID) (err error) {
// which should be rarely needed.
func (net *Network) ConnectNodesFull(ids []enode.ID) (err error) {
if ids == nil {
ids = net.GetUpNodeIDs()
ids = net.getUpNodeIDs()
}
l := len(ids)
for i := 0; i < l; i++ {
@ -91,7 +91,7 @@ func (net *Network) ConnectNodesFull(ids []enode.ID) (err error) {
// If ids argument is nil, all nodes that are up will be connected.
func (net *Network) ConnectNodesChain(ids []enode.ID) (err error) {
if ids == nil {
ids = net.GetUpNodeIDs()
ids = net.getUpNodeIDs()
}
l := len(ids)
for i := 0; i < l-1; i++ {
@ -107,7 +107,7 @@ func (net *Network) ConnectNodesChain(ids []enode.ID) (err error) {
// If ids argument is nil, all nodes that are up will be connected.
func (net *Network) ConnectNodesRing(ids []enode.ID) (err error) {
if ids == nil {
ids = net.GetUpNodeIDs()
ids = net.getUpNodeIDs()
}
l := len(ids)
if l < 2 {
@ -127,7 +127,7 @@ func (net *Network) ConnectNodesRing(ids []enode.ID) (err error) {
// If ids argument is nil, all nodes that are up will be connected.
func (net *Network) ConnectNodesStar(id enode.ID, ids []enode.ID) (err error) {
if ids == nil {
ids = net.GetUpNodeIDs()
ids = net.getUpNodeIDs()
}
l := len(ids)
for i := 0; i < l; i++ {

56
p2p/simulations/network.go
View file

@ -386,6 +386,15 @@ func (net *Network) GetNodeByName(name string) *Node {
return net.getNodeByName(name)
}
func (net *Network) getNodeByName(name string) *Node {
for _, node := range net.Nodes {
if node.Config.Name == name {
return node
}
}
return nil
}
// GetNodes returns the existing nodes
func (net *Network) GetNodes() (nodes []*Node) {
net.lock.Lock()
@ -395,19 +404,6 @@ func (net *Network) GetNodes() (nodes []*Node) {
return nodes
}
// GetUpNodeIDs returns NodeIDs for nodes that are up in the network.
func (net *Network) GetUpNodeIDs() (ids []enode.ID) {
net.lock.Lock()
defer net.lock.Unlock()
for _, node := range net.Nodes {
if node.Up {
ids = append(ids, node.ID())
}
}
return ids
}
func (net *Network) getNode(id enode.ID) *Node {
i, found := net.nodeMap[id]
if !found {
@ -416,30 +412,31 @@ func (net *Network) getNode(id enode.ID) *Node {
return net.Nodes[i]
}
func (net *Network) getNodeByName(name string) *Node {
// GetRandomUpNode returns a random node on the network, which is running.
func (net *Network) GetRandomUpNode(excludeIDs ...enode.ID) *Node {
net.lock.RLock()
defer net.lock.RUnlock()
return net.getRandomNode(net.getUpNodeIDs(), excludeIDs)
}
func (net *Network) getUpNodeIDs() (ids []enode.ID) {
for _, node := range net.Nodes {
if node.Config.Name == name {
return node
if node.Up {
ids = append(ids, node.ID())
}
}
return nil
return ids
}
// GetRandomUpNode returns a random SimNode that is up.
// Arguments are NodeIDs for nodes that should not be returned.
func (net *Network) GetRandomUpNode(excludeIDs ...enode.ID) *Node {
return net.getRandomNode(net.GetUpNodeIDs(), excludeIDs)
}
// GetRandomDownNode returns a random SimNode that is not up.
// GetRandomDownNode returns a random node on the network, which is stopped.
func (net *Network) GetRandomDownNode(excludeIDs ...enode.ID) *Node {
return net.getRandomNode(net.GetDownNodeIDs(), excludeIDs)
net.lock.RLock()
defer net.lock.RUnlock()
return net.getRandomNode(net.getDownNodeIDs(), excludeIDs)
}
// GetDownNodeIDs returns NodeIDs for nodes that are stopped in the network.
func (net *Network) GetDownNodeIDs() (ids []enode.ID) {
nodes := net.GetNodes()
for _, node := range nodes {
func (net *Network) getDownNodeIDs() (ids []enode.ID) {
for _, node := range net.GetNodes() {
if !node.Up {
ids = append(ids, node.ID())
}
@ -447,7 +444,6 @@ func (net *Network) GetDownNodeIDs() (ids []enode.ID) {
return ids
}
// getRandomNode returns a random SimNode from the slice of NodeIDs.
func (net *Network) getRandomNode(ids []enode.ID, excludeIDs []enode.ID) *Node {
filtered := filterIDs(ids, excludeIDs)