From d470a3cb3fa3528d01c5c8668aaef3c54df9996f Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Mon, 30 May 2022 11:58:38 +0200
Subject: [PATCH] gen-manifests: inline finish() into wait()

wait() just did finish() and returned errors; no need for two
functions.
---
 cmd/gen-manifests/workerqueue.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/cmd/gen-manifests/workerqueue.go b/cmd/gen-manifests/workerqueue.go
index ce23e304f..46d82afaf 100644
--- a/cmd/gen-manifests/workerqueue.go
+++ b/cmd/gen-manifests/workerqueue.go
@@ -60,13 +60,8 @@ func (wq *workerQueue) start() {
 	}
 }
 
-func (wq *workerQueue) wait() []error {
-	wq.finish()
-	return wq.errors
-}
-
 // close all queues and wait for waitgroups
-func (wq *workerQueue) finish() {
+func (wq *workerQueue) wait() []error {
 	// close job channel and wait for workers to finish
 	close(wq.jobQueue)
 	wq.workerWG.Wait()
@@ -75,6 +70,7 @@ func (wq *workerQueue) finish() {
 	close(wq.msgQueue)
 	close(wq.errQueue)
 	wq.utilWG.Wait()
+	return wq.errors
 }
 
 func (wq *workerQueue) startWorker(idx uint32) {