From 645b900fb071028a6badea40ca398725ca9ec0db Mon Sep 17 00:00:00 2001 From: Zsolt Felfoldi Date: Tue, 22 Jan 2019 11:35:32 +0100 Subject: [PATCH] les: fixed tests --- les/handler.go | 9 +++++++-- les/peer.go | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/les/handler.go b/les/handler.go index a8fbec895c..d8f307d5d8 100644 --- a/les/handler.go +++ b/les/handler.go @@ -381,9 +381,14 @@ func (pm *ProtocolManager) handleMsg(p *peer) error { if reply != nil { replySize = reply.size() } - realCost := pm.server.costTracker.realCost(servingTime, msg.Size, replySize) + var realCost uint64 + if pm.server.costTracker != nil { + realCost = pm.server.costTracker.realCost(servingTime, msg.Size, replySize) + pm.server.costTracker.updateStats(msg.Code, amount, servingTime, realCost) + } else { + realCost = maxCost + } bv := p.fcClient.RequestProcessed(reqID, responseCount, maxCost, realCost) - pm.server.costTracker.updateStats(msg.Code, amount, servingTime, realCost) if reply != nil { p.queueSend(func() { if err := reply.send(bv); err != nil { diff --git a/les/peer.go b/les/peer.go index ff1de07c24..6572370ba3 100644 --- a/les/peer.go +++ b/les/peer.go @@ -519,7 +519,12 @@ func (p *peer) Handshake(td *big.Int, head common.Hash, headNum uint64, genesis } send = send.add("flowControl/BL", server.defParams.BufLimit) send = send.add("flowControl/MRR", server.defParams.MinRecharge) - costList := server.costTracker.makeCostList() + var costList RequestCostList + if server.costTracker != nil { + costList = server.costTracker.makeCostList() + } else { + costList = testRCL() + } send = send.add("flowControl/MRC", costList) p.fcCosts = costList.decode() p.fcParams = server.defParams