forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 20:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: fix TestSubscribePendingTxHashes deadlock by handling errors

Browse source
This commit is contained in:
RinCodeForge927 2026-01-10 20:03:29 +07:00
parent 33e1129aeb
commit 84ff87cc65
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ethclient/gethclient/gethclient_test.go
View file

@ -413,11 +413,19 @@ func testSubscribePendingTransactions(t *testing.T, client *rpc.Client) {
// Subscribe to Transactions // Subscribe to Transactions
ch1 := make(chan common.Hash) ch1 := make(chan common.Hash)
ec.SubscribePendingTransactions(context.Background(), ch1) sub1, err := ec.SubscribePendingTransactions(context.Background(), ch1)
if err != nil {
t.Fatalf("subscribe pending txs failed: %v", err)
}
defer sub1.Unsubscribe()
// Subscribe to Transactions // Subscribe to Transactions
ch2 := make(chan *types.Transaction) ch2 := make(chan *types.Transaction)
ec.SubscribeFullPendingTransactions(context.Background(), ch2) sub2, err := ec.SubscribeFullPendingTransactions(context.Background(), ch2)
if err != nil {
t.Fatalf("subscribe full pending txs failed: %v", err)
}
defer sub2.Unsubscribe()
// Send a transaction // Send a transaction
chainID, err := ethcl.ChainID(context.Background()) chainID, err := ethcl.ChainID(context.Background())
@ -445,14 +453,23 @@ func testSubscribePendingTransactions(t *testing.T, client *rpc.Client) {
t.Fatal(err) t.Fatal(err)
} }
// Check that the transaction was sent over the channel // Check that the transaction was sent over the channel
hash := <-ch1 select {
if hash != signedTx.Hash() { case hash := <-ch1:
t.Fatalf("Invalid tx hash received, got %v, want %v", hash, signedTx.Hash()) if hash != signedTx.Hash() {
t.Fatalf("Invalid tx hash received, got %v, want %v", hash, signedTx.Hash())
}
case err := <-sub1.Err():
t.Fatalf("subscription 1 error: %v", err)
} }
// Check that the transaction was sent over the channel // Check that the transaction was sent over the channel
tx = <-ch2 select {
if tx.Hash() != signedTx.Hash() { case tx := <-ch2:
t.Fatalf("Invalid tx hash received, got %v, want %v", tx.Hash(), signedTx.Hash()) if tx.Hash() != signedTx.Hash() {
t.Fatalf("Invalid tx hash received, got %v, want %v", tx.Hash(), signedTx.Hash())
}
case err := <-sub2.Err():
t.Fatalf("subscription 2 error: %v", err)
} }
} }