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

p2p/simulations: Fix creating snapshots

Browse source 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
This commit is contained in:
Lewis Marshall 2017-06-05 10:51:43 +01:00
parent a92a341450
commit 479409d1f3
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ func (s *SimAdapter) NewNode(config *NodeConfig) (Node, error) {
ID: id, ID: id,
config: config, config: config,
adapter: s, adapter: s,
running: make(map[string]node.Service),
} }
s.nodes[id] = node s.nodes[id] = node
return node, nil return node, nil
@ -135,7 +136,7 @@ type SimNode struct {
config *NodeConfig config *NodeConfig
adapter *SimAdapter adapter *SimAdapter
node *node.Node node *node.Node
running []node.Service running map[string]node.Service
client *rpc.Client client *rpc.Client
} }
@ -181,12 +182,24 @@ func (self *SimNode) ServeRPC(conn net.Conn) error {
// simulation_snapshot RPC method // simulation_snapshot RPC method
func (self *SimNode) Snapshots() (map[string][]byte, error) { func (self *SimNode) Snapshots() (map[string][]byte, error) {
self.lock.Lock() self.lock.Lock()
defer self.lock.Unlock() services := self.running
if self.client == nil { self.lock.Unlock()
return nil, errors.New("RPC not started") if len(services) == 0 {
return nil, errors.New("no running services")
} }
var snapshots map[string][]byte snapshots := make(map[string][]byte)
return snapshots, self.client.Call(&snapshots, "simulation_snapshot") for name, service := range services {
if s, ok := service.(interface {
Snapshot() ([]byte, error)
}); ok {
snap, err := s.Snapshot()
if err != nil {
return nil, err
}
snapshots[name] = snap
}
}
return snapshots, nil
} }
// Start starts the RPC handler and the underlying service // Start starts the RPC handler and the underlying service
@ -212,7 +225,7 @@ func (self *SimNode) Start(snapshots map[string][]byte) error {
if err != nil { if err != nil {
return nil, err return nil, err
} }
self.running = append(self.running, service) self.running[name] = service
return service, nil return service, nil
} }
} }
@ -270,7 +283,11 @@ func (self *SimNode) Stop() error {
func (self *SimNode) Services() []node.Service { func (self *SimNode) Services() []node.Service {
self.lock.Lock() self.lock.Lock()
defer self.lock.Unlock() defer self.lock.Unlock()
return self.running services := make([]node.Service, 0, len(self.running))
for _, service := range self.running {
services = append(services, service)
}
return services
} }
func (self *SimNode) Server() *p2p.Server { func (self *SimNode) Server() *p2p.Server {