From 829c3cba34a224e174e236f92fd3daad699f4a4b Mon Sep 17 00:00:00 2001
From: Jared Wasinger <j-wasinger@hotmail.com>
Date: Fri, 7 Mar 2025 10:23:04 +0100
Subject: [PATCH] accounts/abi/bind/v2: simplify EventIterator.Next interface: 
 don't return error

---
 accounts/abi/bind/v2/lib.go      | 14 +++++++-------
 accounts/abi/bind/v2/lib_test.go | 16 ++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/accounts/abi/bind/v2/lib.go b/accounts/abi/bind/v2/lib.go
index 8f3367e23a..a5052d94ec 100644
--- a/accounts/abi/bind/v2/lib.go
+++ b/accounts/abi/bind/v2/lib.go
@@ -106,10 +106,10 @@ func (it *EventIterator[T]) Value() *T {
 // If the attempt to convert the raw log object to an instance of T using the
 // unpack function provided via FilterEvents returns an error: that error is
 // returned and subsequent calls to Next will not advance the iterator.
-func (it *EventIterator[T]) Next() (advanced bool, err error) {
+func (it *EventIterator[T]) Next() (advanced bool) {
 	// If the iterator failed with an error, don't proceed
 	if it.fail != nil || it.closed {
-		return false, it.fail
+		return false
 	}
 	// if the iterator is still active, block until a log is received or the
 	// underlying subscription terminates.
@@ -118,10 +118,10 @@ func (it *EventIterator[T]) Next() (advanced bool, err error) {
 		res, err := it.unpack(&log)
 		if err != nil {
 			it.fail = err
-			return false, it.fail
+			return false
 		}
 		it.current = res
-		return true, it.fail
+		return true
 	case <-it.sub.Err():
 		// regardless of how the subscription ends, still be able to iterate
 		// over any unread logs.
@@ -130,12 +130,12 @@ func (it *EventIterator[T]) Next() (advanced bool, err error) {
 			res, err := it.unpack(&log)
 			if err != nil {
 				it.fail = err
-				return false, it.fail
+				return false
 			}
 			it.current = res
-			return true, it.fail
+			return true
 		default:
-			return false, it.fail
+			return false
 		}
 	}
 }
diff --git a/accounts/abi/bind/v2/lib_test.go b/accounts/abi/bind/v2/lib_test.go
index 2a6f1be1d0..fc895edad5 100644
--- a/accounts/abi/bind/v2/lib_test.go
+++ b/accounts/abi/bind/v2/lib_test.go
@@ -286,24 +286,16 @@ done:
 
 	e1Count = 0
 	e2Count = 0
-	for {
-		advanced, err := it.Next()
-		if err != nil {
+	for it.Next() {
+		if err := it.Error(); err != nil {
 			t.Fatalf("got error while iterating events for e1: %v", err)
 		}
-		if !advanced {
-			break
-		}
 		e1Count++
 	}
-	for {
-		advanced, err := it2.Next()
-		if err != nil {
+	for it2.Next() {
+		if err := it2.Error(); err != nil {
 			t.Fatalf("got error while iterating events for e2: %v", err)
 		}
-		if !advanced {
-			break
-		}
 		e2Count++
 	}
 	if e1Count != 2 {