forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 01:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflicts fix

Browse source
This commit is contained in:
Pető Zoltán 2017-12-07 12:23:31 +01:00
commit c2f048184f
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
les/handler.go
View file

@ -1073,6 +1073,9 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
} }
bv, rcost := p.fcClient.RequestProcessed(costs.baseCost + uint64(reqCnt)*costs.reqCost) bv, rcost := p.fcClient.RequestProcessed(costs.baseCost + uint64(reqCnt)*costs.reqCost)
pm.server.fcCostStats.update(msg.Code, uint64(reqCnt), rcost) pm.server.fcCostStats.update(msg.Code, uint64(reqCnt), rcost)
if pm.server.influxDBLogger != nil {
pm.server.influxDBLogger.WriteData(msg.Code, uint64(reqCnt), rcost, mclock.Now(), p.id)
}
return p.SendTxStatus(req.ReqID, bv, pm.txStatus(req.Hashes)) return p.SendTxStatus(req.ReqID, bv, pm.txStatus(req.Hashes))