forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

p2p/simulations: Fix SimAdapter

Browse source 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
This commit is contained in:
Lewis Marshall 2017-05-18 10:09:20 -07:00
parent 020214b7ca
commit 2073ee7c73
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
p2p/simulations/adapters/inproc.go
View file

@ -35,8 +35,9 @@ import (
// SimAdapter is a NodeAdapter which creates in-memory nodes and connects them // SimAdapter is a NodeAdapter which creates in-memory nodes and connects them
// using an in-memory p2p.MsgReadWriter pipe // using an in-memory p2p.MsgReadWriter pipe
type SimAdapter struct { type SimAdapter struct {
mtx sync.RWMutex mtx sync.RWMutex
nodes map[discover.NodeID]*SimNode nodes map[discover.NodeID]*SimNode
services map[string]ServiceFunc
} }
// NewSimAdapter creates a SimAdapter which is capable of running in-memory // NewSimAdapter creates a SimAdapter which is capable of running in-memory
@ -44,7 +45,8 @@ type SimAdapter struct {
// node is passed to the NewNode function in the NodeConfig) // node is passed to the NewNode function in the NodeConfig)
func NewSimAdapter(services map[string]ServiceFunc) *SimAdapter { func NewSimAdapter(services map[string]ServiceFunc) *SimAdapter {
return &SimAdapter{ return &SimAdapter{
nodes: make(map[discover.NodeID]*SimNode), nodes: make(map[discover.NodeID]*SimNode),
services: services,
} }
} }
@ -86,7 +88,7 @@ func (s *SimAdapter) NewNode(config *NodeConfig) (Node, error) {
//} //}
//service := serviceFunc(id) //service := serviceFunc(id)
for _, service := range serviceFuncs[config.Service](id, nil) { for _, service := range s.services[config.Service](id, nil) {
for _, proto := range service.Protocols() { for _, proto := range service.Protocols() {
nodeprotos = append(nodeprotos, proto) nodeprotos = append(nodeprotos, proto)
} }
@ -101,6 +103,7 @@ func (s *SimAdapter) NewNode(config *NodeConfig) (Node, error) {
Dialer: s, Dialer: s,
EnableMsgEvents: true, EnableMsgEvents: true,
}, },
NoUSB: true,
}) })
if err != nil { if err != nil {
return nil, err return nil, err
@ -108,7 +111,7 @@ func (s *SimAdapter) NewNode(config *NodeConfig) (Node, error) {
simnode := &SimNode{ simnode := &SimNode{
Id: id, Id: id,
serviceFunc: serviceFuncs[config.Service], serviceFunc: s.services[config.Service],
adapter: s, adapter: s,
config: config, config: config,
running: []node.Service{}, running: []node.Service{},