forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

les: fix variable name

Browse source
This commit is contained in:
rjl493456442 2019-06-12 15:25:00 +08:00
parent 09149afe26
commit 2b349f474a
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
les/handler.go
View file

@ -528,7 +528,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
origin = pm.blockchain.GetHeaderByNumber(query.Origin.Number) origin = pm.blockchain.GetHeaderByNumber(query.Origin.Number)
} }
if origin == nil { if origin == nil {
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
break break
} }
headers = append(headers, origin) headers = append(headers, origin)
@ -638,7 +638,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
} }
number := rawdb.ReadHeaderNumber(pm.chainDb, hash) number := rawdb.ReadHeaderNumber(pm.chainDb, hash)
if number == nil { if number == nil {
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
if data := rawdb.ReadBodyRLP(pm.chainDb, hash, *number); len(data) != 0 { if data := rawdb.ReadBodyRLP(pm.chainDb, hash, *number); len(data) != 0 {
@ -698,7 +698,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
number := rawdb.ReadHeaderNumber(pm.chainDb, request.BHash) number := rawdb.ReadHeaderNumber(pm.chainDb, request.BHash)
if number == nil { if number == nil {
p.Log().Warn("Failed to retrieve block num for code", "hash", request.BHash) p.Log().Warn("Failed to retrieve block num for code", "hash", request.BHash)
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
header := rawdb.ReadHeader(pm.chainDb, request.BHash, *number) header := rawdb.ReadHeader(pm.chainDb, request.BHash, *number)
@ -711,7 +711,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
local := pm.blockchain.CurrentHeader().Number.Uint64() local := pm.blockchain.CurrentHeader().Number.Uint64()
if !pm.server.archiveMode && header.Number.Uint64()+core.TriesInMemory <= local { if !pm.server.archiveMode && header.Number.Uint64()+core.TriesInMemory <= local {
p.Log().Debug("Reject stale code request", "number", header.Number.Uint64(), "head", local) p.Log().Debug("Reject stale code request", "number", header.Number.Uint64(), "head", local)
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
triedb := pm.blockchain.StateCache().TrieDB() triedb := pm.blockchain.StateCache().TrieDB()
@ -719,7 +719,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
account, err := pm.getAccount(triedb, header.Root, common.BytesToHash(request.AccKey)) account, err := pm.getAccount(triedb, header.Root, common.BytesToHash(request.AccKey))
if err != nil { if err != nil {
p.Log().Warn("Failed to retrieve account for code", "block", header.Number, "hash", header.Hash(), "account", common.BytesToHash(request.AccKey), "err", err) p.Log().Warn("Failed to retrieve account for code", "block", header.Number, "hash", header.Hash(), "account", common.BytesToHash(request.AccKey), "err", err)
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
code, err := triedb.Node(common.BytesToHash(account.CodeHash)) code, err := triedb.Node(common.BytesToHash(account.CodeHash))
@ -788,7 +788,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
var results types.Receipts var results types.Receipts
number := rawdb.ReadHeaderNumber(pm.chainDb, hash) number := rawdb.ReadHeaderNumber(pm.chainDb, hash)
if number == nil { if number == nil {
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
results = rawdb.ReadRawReceipts(pm.chainDb, hash, *number) results = rawdb.ReadRawReceipts(pm.chainDb, hash, *number)
@ -866,7 +866,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
if number = rawdb.ReadHeaderNumber(pm.chainDb, request.BHash); number == nil { if number = rawdb.ReadHeaderNumber(pm.chainDb, request.BHash); number == nil {
p.Log().Warn("Failed to retrieve block num for proof", "hash", request.BHash) p.Log().Warn("Failed to retrieve block num for proof", "hash", request.BHash)
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
if header = rawdb.ReadHeader(pm.chainDb, request.BHash, *number); header == nil { if header = rawdb.ReadHeader(pm.chainDb, request.BHash, *number); header == nil {
@ -878,7 +878,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
local := pm.blockchain.CurrentHeader().Number.Uint64() local := pm.blockchain.CurrentHeader().Number.Uint64()
if !pm.server.archiveMode && header.Number.Uint64()+core.TriesInMemory <= local { if !pm.server.archiveMode && header.Number.Uint64()+core.TriesInMemory <= local {
p.Log().Debug("Reject stale trie request", "number", header.Number.Uint64(), "head", local) p.Log().Debug("Reject stale trie request", "number", header.Number.Uint64(), "head", local)
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
root = header.Root root = header.Root
@ -903,7 +903,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
account, err := pm.getAccount(statedb.TrieDB(), root, common.BytesToHash(request.AccKey)) account, err := pm.getAccount(statedb.TrieDB(), root, common.BytesToHash(request.AccKey))
if err != nil { if err != nil {
p.Log().Warn("Failed to retrieve account for proof", "block", header.Number, "hash", header.Hash(), "account", common.BytesToHash(request.AccKey), "err", err) p.Log().Warn("Failed to retrieve account for proof", "block", header.Number, "hash", header.Hash(), "account", common.BytesToHash(request.AccKey), "err", err)
atomic.AddUint32(&p.invalidReq, 1) atomic.AddUint32(&p.invalidCount, 1)
continue continue
} }
trie, err = statedb.OpenStorageTrie(common.BytesToHash(request.AccKey), account.Root) trie, err = statedb.OpenStorageTrie(common.BytesToHash(request.AccKey), account.Root)
@ -1152,7 +1152,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
} }
// If the client has made too much invalid request(e.g. request a non-exist data), // If the client has made too much invalid request(e.g. request a non-exist data),
// reject them to prevent SPAM attack. // reject them to prevent SPAM attack.
if atomic.LoadUint32(&p.invalidReq) > maxRequestErrors { if atomic.LoadUint32(&p.invalidCount) > maxRequestErrors {
return errTooManyInvalidRequest return errTooManyInvalidRequest
} }
return nil return nil

7
les/handler_test.go
View file

@ -597,9 +597,10 @@ func TestStopResumeLes3(t *testing.T) {
expBuf := testBufLimit expBuf := testBufLimit
var reqID uint64 var reqID uint64
header := pm.blockchain.CurrentHeader()
req := func() { req := func() {
reqID++ reqID++
sendRequest(peer.app, GetBlockHeadersMsg, reqID, testCost, &getBlockHeadersData{Origin: hashOrNumber{Hash: common.Hash{1}}, Amount: 1}) sendRequest(peer.app, GetBlockHeadersMsg, reqID, testCost, &getBlockHeadersData{Origin: hashOrNumber{Hash: header.Hash()}, Amount: 1})
} }
for i := 1; i <= 5; i++ { for i := 1; i <= 5; i++ {
@ -607,8 +608,8 @@ func TestStopResumeLes3(t *testing.T) {
for expBuf >= testCost { for expBuf >= testCost {
req() req()
expBuf -= testCost expBuf -= testCost
if err := expectResponse(peer.app, BlockHeadersMsg, reqID, expBuf, nil); err != nil { if err := expectResponse(peer.app, BlockHeadersMsg, reqID, expBuf, []*types.Header{header}); err != nil {
t.Errorf("expected response and failed: %v", err) t.Fatalf("expected response and failed: %v", err)
} }
} }
// send some more requests in excess and expect a single StopMsg // send some more requests in excess and expect a single StopMsg

2
les/peer.go
View file

@ -91,7 +91,7 @@ type peer struct {
// RequestProcessed is called // RequestProcessed is called
responseLock sync.Mutex responseLock sync.Mutex
responseCount uint64 responseCount uint64
invalidReq uint32 invalidCount uint32
poolEntry *poolEntry poolEntry *poolEntry
hasBlock func(common.Hash, uint64, bool) bool hasBlock func(common.Hash, uint64, bool) bool