ethstats: sanity check ethstats history queries

This commit is contained in:
Péter Szilágyi 2017-03-31 15:06:54 +03:00
parent 105b37f1b4
commit 96d1a4aee6
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D
1 changed files with 8 additions and 2 deletions

View File

@ -537,10 +537,16 @@ func (s *Service) reportHistory(conn *websocket.Conn, list []uint64) error {
// Gather the batch of blocks to report // Gather the batch of blocks to report
history := make([]*blockStats, len(indexes)) history := make([]*blockStats, len(indexes))
for i, number := range indexes { for i, number := range indexes {
var block *types.Block
if s.eth != nil { if s.eth != nil {
history[len(history)-1-i] = s.assembleBlockStats(s.eth.BlockChain().GetBlockByNumber(number)) block = s.eth.BlockChain().GetBlockByNumber(number)
} else { } else {
history[len(history)-1-i] = s.assembleBlockStats(types.NewBlockWithHeader(s.les.BlockChain().GetHeaderByNumber(number))) if header := s.les.BlockChain().GetHeaderByNumber(number); header != nil {
block = types.NewBlockWithHeader(header)
}
}
if block != nil {
history[len(history)-1-i] = s.assembleBlockStats(block)
} }
} }
// Assemble the history report and send it to the server // Assemble the history report and send it to the server