diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-09-05 18:39:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 18:39:18 +0800 |
| commit | c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c (patch) | |
| tree | da60bb454f0b527f83986d2f1d319679e772261b /internal/ethapi | |
| parent | 2bacf36d8095ac7936f69552e2727ac6f276479f (diff) | |
| parent | da7d57e07c04dcbb7cc20b35f6606ef3f4c400e3 (diff) | |
| download | dexon-c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c.tar dexon-c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c.tar.gz dexon-c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c.tar.bz2 dexon-c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c.tar.lz dexon-c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c.tar.xz dexon-c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c.tar.zst dexon-c91f7beb53ff1ab0376d9aa5fab5a8de8b04631c.zip | |
Merge pull request #15085 from karalabe/txpool-immutable
core: make txpool operate on immutable state
Diffstat (limited to 'internal/ethapi')
| -rw-r--r-- | internal/ethapi/api.go | 1 | ||||
| -rw-r--r-- | internal/ethapi/backend.go | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 30710aaab..0775749e7 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1265,7 +1265,6 @@ func (s *PublicTransactionPoolAPI) Resend(ctx context.Context, sendArgs SendTxAr if err != nil { return common.Hash{}, err } - s.b.RemoveTx(p.Hash()) if err = s.b.SendTx(ctx, signedTx); err != nil { return common.Hash{}, err } diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index be17ffeae..368fa4872 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -59,7 +59,6 @@ type Backend interface { // TxPool API SendTx(ctx context.Context, signedTx *types.Transaction) error - RemoveTx(txHash common.Hash) GetPoolTransactions() (types.Transactions, error) GetPoolTransaction(txHash common.Hash) *types.Transaction GetPoolNonce(ctx context.Context, addr common.Address) (uint64, error) |