Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit 78d089b5b7 - Show all commits

View File

@ -299,7 +299,7 @@ func testSubscribePendingTransactions(t *testing.T, client *rpc.Client) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// Check that the transaction was send over the channel // Check that the transaction was sent over the channel
hash := <-ch hash := <-ch
if hash != signedTx.Hash() { if hash != signedTx.Hash() {
t.Fatalf("Invalid tx hash received, got %v, want %v", hash, signedTx.Hash()) t.Fatalf("Invalid tx hash received, got %v, want %v", hash, signedTx.Hash())
@ -333,7 +333,7 @@ func testSubscribeFullPendingTransactions(t *testing.T, client *rpc.Client) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// Check that the transaction was send over the channel // Check that the transaction was sent over the channel
tx = <-ch tx = <-ch
if tx.Hash() != signedTx.Hash() { if tx.Hash() != signedTx.Hash() {
t.Fatalf("Invalid tx hash received, got %v, want %v", tx.Hash(), signedTx.Hash()) t.Fatalf("Invalid tx hash received, got %v, want %v", tx.Hash(), signedTx.Hash())