3 files changed, 43 insertions, 24 deletions
diff --git a/testrig/mediahandler.go b/testrig/mediahandler.go
index 430e87eb0..d61ba854d 100644
--- a/testrig/mediahandler.go
+++ b/testrig/mediahandler.go
@@ -24,6 +24,5 @@ import (
 
 // NewTestMediaManager returns a media handler with the default test config, and the given db and storage.
 func NewTestMediaManager(state *state.State) *media.Manager {
-	StartNoopWorkers(state) // ensure started
 	return media.NewManager(state)
 }
diff --git a/testrig/processor.go b/testrig/processor.go
index e8a871422..a1bab4f9a 100644
--- a/testrig/processor.go
+++ b/testrig/processor.go
@@ -31,10 +31,5 @@ import (
 // The passed in state will have its worker functions set appropriately,
 // but the state will not be initialized.
 func NewTestProcessor(state *state.State, federator *federation.Federator, emailSender email.Sender, mediaManager *media.Manager) *processing.Processor {
-	p := processing.NewProcessor(cleaner.New(state), typeutils.NewConverter(state), federator, NewTestOauthServer(state.DB), mediaManager, state, emailSender)
-	state.Workers.EnqueueClientAPI = p.Workers().EnqueueClientAPI
-	state.Workers.EnqueueFediAPI = p.Workers().EnqueueFediAPI
-	state.Workers.ProcessFromClientAPI = p.Workers().ProcessFromClientAPI
-	state.Workers.ProcessFromFediAPI = p.Workers().ProcessFromFediAPI
-	return p
+	return processing.NewProcessor(cleaner.New(state), typeutils.NewConverter(state), federator, NewTestOauthServer(state.DB), mediaManager, state, emailSender)
 }
diff --git a/testrig/util.go b/testrig/util.go
index f6f139e79..d5eaedcd5 100644
--- a/testrig/util.go
+++ b/testrig/util.go
@@ -27,7 +27,10 @@ import (
 	"os"
 	"time"
 
+	"codeberg.org/gruf/go-byteutil"
+	"codeberg.org/gruf/go-kv/format"
 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 	"github.com/superseriousbusiness/gotosocial/internal/messages"
 	tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline"
 	"github.com/superseriousbusiness/gotosocial/internal/processing/workers"
@@ -39,40 +42,55 @@ import (
 // Starts workers on the provided state using noop processing functions.
 // Useful when you *don't* want to trigger side effects in a test.
 func StartNoopWorkers(state *state.State) {
-	state.Workers.EnqueueClientAPI = func(context.Context, ...messages.FromClientAPI) {}
-	state.Workers.EnqueueFediAPI = func(context.Context, ...messages.FromFediAPI) {}
-	state.Workers.ProcessFromClientAPI = func(context.Context, messages.FromClientAPI) error { return nil }
-	state.Workers.ProcessFromFediAPI = func(context.Context, messages.FromFediAPI) error { return nil }
+	state.Workers.Client.Process = func(ctx context.Context, msg *messages.FromClientAPI) error { return nil }
+	state.Workers.Federator.Process = func(ctx context.Context, msg *messages.FromFediAPI) error { return nil }
 
+	state.Workers.Client.Init(messages.ClientMsgIndices())
+	state.Workers.Federator.Init(messages.FederatorMsgIndices())
 	state.Workers.Delivery.Init(nil)
 
+	// Specifically do NOT start the workers
+	// as caller may require queue contents.
+	// (i.e. don't want workers pulling)
+	// _ = state.Workers.Client.Start(1)
+	// _ = state.Workers.Federator.Start(1)
+	// _ = state.Workers.Dereference.Start(1)
+	// _ = state.Workers.Media.Start(1)
+	//
+	// (except for the scheduler, that's fine)
 	_ = state.Workers.Scheduler.Start()
-	_ = state.Workers.ClientAPI.Start(1, 10)
-	_ = state.Workers.Federator.Start(1, 10)
-	_ = state.Workers.Media.Start(1, 10)
 }
 
 // Starts workers on the provided state using processing functions from the given
 // workers processor. Useful when you *do* want to trigger side effects in a test.
 func StartWorkers(state *state.State, processor *workers.Processor) {
-	state.Workers.EnqueueClientAPI = processor.EnqueueClientAPI
-	state.Workers.EnqueueFediAPI = processor.EnqueueFediAPI
-	state.Workers.ProcessFromClientAPI = processor.ProcessFromClientAPI
-	state.Workers.ProcessFromFediAPI = processor.ProcessFromFediAPI
+	state.Workers.Client.Process = func(ctx context.Context, msg *messages.FromClientAPI) error {
+		log.Debugf(ctx, "Workers{}.Client{}.Process(%s)", dump(msg))
+		return processor.ProcessFromClientAPI(ctx, msg)
+	}
+
+	state.Workers.Federator.Process = func(ctx context.Context, msg *messages.FromFediAPI) error {
+		log.Debugf(ctx, "Workers{}.Federator{}.Process(%s)", dump(msg))
+		return processor.ProcessFromFediAPI(ctx, msg)
+	}
 
+	state.Workers.Client.Init(messages.ClientMsgIndices())
+	state.Workers.Federator.Init(messages.FederatorMsgIndices())
 	state.Workers.Delivery.Init(nil)
 
 	_ = state.Workers.Scheduler.Start()
-	_ = state.Workers.ClientAPI.Start(1, 10)
-	_ = state.Workers.Federator.Start(1, 10)
-	_ = state.Workers.Media.Start(1, 10)
+	state.Workers.Client.Start(1)
+	state.Workers.Federator.Start(1)
+	state.Workers.Dereference.Start(1)
+	state.Workers.Media.Start(1)
 }
 
 func StopWorkers(state *state.State) {
 	_ = state.Workers.Scheduler.Stop()
-	_ = state.Workers.ClientAPI.Stop()
-	_ = state.Workers.Federator.Stop()
-	_ = state.Workers.Media.Stop()
+	state.Workers.Client.Stop()
+	state.Workers.Federator.Stop()
+	state.Workers.Dereference.Stop()
+	state.Workers.Media.Stop()
 }
 
 func StartTimelines(state *state.State, filter *visibility.Filter, converter *typeutils.Converter) {
@@ -241,3 +259,10 @@ func WaitFor(condition func() bool) bool {
 		}
 	}
 }
+
+// dump returns debug output of 'v'.
+func dump(v any) string {
+	var buf byteutil.Buffer
+	format.Append(&buf, v)
+	return buf.String()
+}