refactor: get resolve err before resolving in loop

KyberNetwork · Dec 29, 2023 · 7f85b5c · 7f85b5c
1 parent b4a777d
commit 7f85b5c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/batcher.go b/batcher.go
@@ -145,15 +145,17 @@ func (b *ChanBatcher[T, R]) batchFnWithRecover(tasks []T) {
 		}
 		logger.Errorf("ChanBatcher.goBatchFn|recovered from panic: %v\n%s", p, string(debug.Stack()))
 		var ret R
+		err, ok := p.(error)
+		if ok {
+			err = errors.Wrap(err, "batchFn panicked")
+		} else {
+			err = errors.Errorf("batchFn panicked: %v", p)
+		}
 		for _, task := range tasks {
 			if task.IsDone() {
 				continue
 			}
-			if err, ok := p.(error); ok {
-				task.Resolve(ret, errors.Wrap(err, "batchFn panicked"))
-			} else {
-				task.Resolve(ret, errors.Errorf("batchFn panicked: %v", p))
-			}
+			task.Resolve(ret, err)
 		}
 	}()
 	b.batchFn(tasks)