diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-07-05 21:51:55 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2017-07-05 21:51:55 +0800 |
| commit | 48ee7f9de7da0455b80ee09f498dbce54127103a (patch) | |
| tree | 1e16769e36f34efd5a22283b06e57e551ac948a0 /eth | |
| parent | a633a2d7ea8aadb1d435679449d002de880fab30 (diff) | |
| download | go-tangerine-48ee7f9de7da0455b80ee09f498dbce54127103a.tar.gz go-tangerine-48ee7f9de7da0455b80ee09f498dbce54127103a.tar.zst go-tangerine-48ee7f9de7da0455b80ee09f498dbce54127103a.zip | |
core, eth, les: polish txpool API around local/remote txs
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/api_backend.go | 3 | ||||
| -rw-r--r-- | eth/handler.go | 2 | ||||
| -rw-r--r-- | eth/helper_test.go | 4 | ||||
| -rw-r--r-- | eth/protocol.go | 4 | ||||
| -rw-r--r-- | eth/protocol_test.go | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/eth/api_backend.go b/eth/api_backend.go index 166b5084d..a60b36e65 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -119,8 +119,7 @@ func (b *EthApiBackend) SendTx(ctx context.Context, signedTx *types.Transaction) b.eth.txMu.Lock() defer b.eth.txMu.Unlock() - b.eth.txPool.SetLocal(signedTx) - return b.eth.txPool.Add(signedTx) + return b.eth.txPool.AddLocal(signedTx) } func (b *EthApiBackend) RemoveTx(txHash common.Hash) { diff --git a/eth/handler.go b/eth/handler.go index 1af9e755b..29f332799 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -661,7 +661,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error { } p.MarkTransaction(tx.Hash()) } - pm.txpool.AddBatch(txs) + pm.txpool.AddRemotes(txs) default: return errResp(ErrInvalidMsgCode, "%v", msg.Code) diff --git a/eth/helper_test.go b/eth/helper_test.go index 0260b9d77..546478a3e 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -94,9 +94,9 @@ type testTxPool struct { lock sync.RWMutex // Protects the transaction pool } -// AddBatch appends a batch of transactions to the pool, and notifies any +// AddRemotes appends a batch of transactions to the pool, and notifies any // listeners if the addition channel is non nil -func (p *testTxPool) AddBatch(txs []*types.Transaction) error { +func (p *testTxPool) AddRemotes(txs []*types.Transaction) error { p.lock.Lock() defer p.lock.Unlock() diff --git a/eth/protocol.go b/eth/protocol.go index 4bc8bee72..376e4663e 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -94,8 +94,8 @@ var errorToString = map[int]string{ } type txPool interface { - // AddBatch 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 // Pending should return pending transactions. // The slice should be modifiable by the caller. diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 2056ee0a8..d3a44ae91 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -130,7 +130,7 @@ func testSendTransactions(t *testing.T, protocol int) { for nonce := range alltxs { alltxs[nonce] = newTestTransaction(testAccount, uint64(nonce), txsize) } - pm.txpool.AddBatch(alltxs) + pm.txpool.AddRemotes(alltxs) // Connect several peers. They should all receive the pending transactions. var wg sync.WaitGroup |