[chore] move client/federator workerpools to Workers{} (#1575)

* replace concurrency worker pools with base models in State.Workers, update code and tests accordingly

* improve code comment

* change back testrig default log level

* un-comment-out TestAnnounceTwice() and fix

---------

Signed-off-by: kim <grufwub@gmail.com>
Reviewed-by: tobi

3 files changed, 14 insertions, 10 deletions

diff --git a/internal/processing/stream/authorize.go b/internal/processing/stream/authorize.go
index 5f6811db9..a30e6fb33 100644
--- a/internal/processing/stream/authorize.go
+++ b/internal/processing/stream/authorize.go
@@ -41,7 +41,7 @@ func (p *Processor) Authorize(ctx context.Context, accessToken string) (*gtsmode
 		return nil, gtserror.NewErrorUnauthorized(err)
 	}
 
-	user, err := p.db.GetUserByID(ctx, uid)
+	user, err := p.state.DB.GetUserByID(ctx, uid)
 	if err != nil {
 		if err == db.ErrNoEntries {
 			err := fmt.Errorf("no user found for validated uid %s", uid)
@@ -50,7 +50,7 @@ func (p *Processor) Authorize(ctx context.Context, accessToken string) (*gtsmode
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	acct, err := p.db.GetAccountByID(ctx, user.AccountID)
+	acct, err := p.state.DB.GetAccountByID(ctx, user.AccountID)
 	if err != nil {
 		if err == db.ErrNoEntries {
 			err := fmt.Errorf("no account found for validated uid %s", uid)
diff --git a/internal/processing/stream/stream.go b/internal/processing/stream/stream.go
index 3c38e720a..a10ab2474 100644
--- a/internal/processing/stream/stream.go
+++ b/internal/processing/stream/stream.go
@@ -22,22 +22,21 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+	"github.com/superseriousbusiness/gotosocial/internal/state"
 	"github.com/superseriousbusiness/gotosocial/internal/stream"
 )
 
 type Processor struct {
-	db          db.DB
+	state       *state.State
 	oauthServer oauth.Server
-	streamMap   *sync.Map
+	streamMap   sync.Map
 }
 
-func New(db db.DB, oauthServer oauth.Server) Processor {
+func New(state *state.State, oauthServer oauth.Server) Processor {
 	return Processor{
-		db:          db,
+		state:       state,
 		oauthServer: oauthServer,
-		streamMap:   &sync.Map{},
 	}
 }
 
diff --git a/internal/processing/stream/stream_test.go b/internal/processing/stream/stream_test.go
index 907c7e1d0..9e1eb57f2 100644
--- a/internal/processing/stream/stream_test.go
+++ b/internal/processing/stream/stream_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
 	"github.com/superseriousbusiness/gotosocial/internal/processing/stream"
+	"github.com/superseriousbusiness/gotosocial/internal/state"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 
@@ -33,19 +34,23 @@ type StreamTestSuite struct {
 	testTokens   map[string]*gtsmodel.Token
 	db           db.DB
 	oauthServer  oauth.Server
+	state        state.State
 
 	streamProcessor stream.Processor
 }
 
 func (suite *StreamTestSuite) SetupTest() {
+	suite.state.Caches.Init()
+
 	testrig.InitTestLog()
 	testrig.InitTestConfig()
 
 	suite.testAccounts = testrig.NewTestAccounts()
 	suite.testTokens = testrig.NewTestTokens()
-	suite.db = testrig.NewTestDB()
+	suite.db = testrig.NewTestDB(&suite.state)
+	suite.state.DB = suite.db
 	suite.oauthServer = testrig.NewTestOauthServer(suite.db)
-	suite.streamProcessor = stream.New(suite.db, suite.oauthServer)
+	suite.streamProcessor = stream.New(&suite.state, suite.oauthServer)
 
 	testrig.StandardDBSetup(suite.db, suite.testAccounts)
 }