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

eth/fetcher: add fetcher timeout test

Browse source
This commit is contained in:
Marius van der Wijden 2023-09-28 14:54:31 +02:00
parent 509a64ffb9
commit 930dcba1fd
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eth/fetcher/tx_fetcher.go
View file

@ -284,7 +284,7 @@ func (f *TxFetcher) Notify(peer string, types []byte, sizes []uint32, hashes []c
// isKnownUnderpriced reports whether a transaction hash was recently found to be underpriced. // isKnownUnderpriced reports whether a transaction hash was recently found to be underpriced.
func (f *TxFetcher) isKnownUnderpriced(hash common.Hash) bool { func (f *TxFetcher) isKnownUnderpriced(hash common.Hash) bool {
prevTime, ok := f.underpriced.Peek(hash) prevTime, ok := f.underpriced.Peek(hash)
if ok && prevTime+maxTxUnderpricedTimeout < time.Now().Unix() { if ok && prevTime+maxTxUnderpricedTimeout < time.Now().UnixNano() {
f.underpriced.Remove(hash) f.underpriced.Remove(hash)
return false return false
} }
@ -335,7 +335,7 @@ func (f *TxFetcher) Enqueue(peer string, txs []*types.Transaction, direct bool)
// Avoid re-request this transaction when we receive another // Avoid re-request this transaction when we receive another
// announcement. // announcement.
if errors.Is(err, txpool.ErrUnderpriced) || errors.Is(err, txpool.ErrReplaceUnderpriced) { if errors.Is(err, txpool.ErrUnderpriced) || errors.Is(err, txpool.ErrReplaceUnderpriced) {
f.underpriced.Add(batch[j].Hash(), batch[j].Time().Unix()) f.underpriced.Add(batch[j].Hash(), batch[j].Time().UnixNano())
} }
// Track a few interesting failure types // Track a few interesting failure types
switch { switch {

31
eth/fetcher/tx_fetcher_test.go
View file

@ -1993,3 +1993,34 @@ func containsHash(slice []common.Hash, hash common.Hash) bool {
} }
return false return false
} }
// Tests that a transaction is forgotten after the timeout.
func TestTransactionForgotten(t *testing.T) {
fetcher := NewTxFetcher(
func(common.Hash) bool { return false },
func(txs []*types.Transaction) []error {
errs := make([]error, len(txs))
for i := 0; i < len(errs); i++ {
errs[i] = txpool.ErrUnderpriced
}
return errs
},
func(string, []common.Hash) error { return nil },
)
go fetcher.loop()
tx1 := types.NewTransaction(0, common.Address{}, common.Big0, 0, common.Big0, nil)
tx1.SetTime(time.Now().Add(-5 * time.Minute))
tx2 := types.NewTransaction(1, common.Address{}, common.Big0, 0, common.Big0, nil)
if fetcher.isKnownUnderpriced(tx1.Hash()) {
t.Fatal("unknown hash can not be underpriced")
}
if err := fetcher.Enqueue("asdf", []*types.Transaction{tx1, tx2}, false); err != nil {
t.Fatal(err)
}
if fetcher.isKnownUnderpriced(tx1.Hash()) {
t.Fatal("transaction should be evicted by this point")
}
if !fetcher.isKnownUnderpriced(tx2.Hash()) {
t.Fatal("transaction should not be known underpriced")
}
}