gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14737 from holiman/txpool_localaccounts

Browse Source 
Txpool localaccounts
This commit is contained in:
Péter Szilágyi
2017-07-10 12:43:23 +03:00
committed by GitHub
parent 65f0e905dd 34ec9913f6
commit 4f7a38001f
13 changed files with 392 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
les/handler.go
View File

@ -87,8 +87,8 @@ type BlockChain interface {
}
type txPool interface {
// AddTransactions should add the given transactions to the pool.
AddBatch([]*types.Transaction) error
// AddRemotes should add the given transactions to the pool.
AddRemotes([]*types.Transaction) error
}
type ProtocolManager struct {
@ -801,7 +801,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
return errResp(ErrRequestRejected, "")
}
if err := pm.txpool.AddBatch(txs); err != nil {
if err := pm.txpool.AddRemotes(txs); err != nil {
return errResp(ErrUnexpectedResponse, "msg: %v", err)
}