[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

2 files changed, 7 insertions, 4 deletions

diff --git a/internal/db/bundb/admin_test.go b/internal/db/bundb/admin_test.go
index b0da97ef1..ce255d036 100644
--- a/internal/db/bundb/admin_test.go
+++ b/internal/db/bundb/admin_test.go
@@ -70,8 +70,8 @@ func (suite *AdminTestSuite) TestIsEmailAvailableDomainBlocked() {
 }
 
 func (suite *AdminTestSuite) TestCreateInstanceAccount() {
-	// reinitialize test DB to clear caches
-	suite.db = testrig.NewTestDB()
+	// reinitialize db caches to clear
+	suite.state.Caches.Init()
 	// we need to take an empty db for this...
 	testrig.StandardDBTeardown(suite.db)
 	// ...with tables created but no data
diff --git a/internal/db/bundb/bundb_test.go b/internal/db/bundb/bundb_test.go
index e050c2b5d..bad8bfc72 100644
--- a/internal/db/bundb/bundb_test.go
+++ b/internal/db/bundb/bundb_test.go
@@ -22,13 +22,15 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/state"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 
 type BunDBStandardTestSuite struct {
 	// standard suite interfaces
 	suite.Suite
-	db db.DB
+	db    db.DB
+	state state.State
 
 	// standard suite models
 	testTokens       map[string]*gtsmodel.Token
@@ -61,9 +63,10 @@ func (suite *BunDBStandardTestSuite) SetupSuite() {
 }
 
 func (suite *BunDBStandardTestSuite) SetupTest() {
+	suite.state.Caches.Init()
 	testrig.InitTestConfig()
 	testrig.InitTestLog()
-	suite.db = testrig.NewTestDB()
+	suite.db = testrig.NewTestDB(&suite.state)
 	testrig.StandardDBSetup(suite.db, suite.testAccounts)
 }