diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2021-09-12 10:10:24 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-09-12 10:10:24 +0100 |
| commit | f6492d12d948507021bbe934de94e87e20464c01 (patch) | |
| tree | 6705d6ef6f3c4d70f3b3ebc77c2960d8e508cf37 /internal/federation | |
| parent | Merge pull request #213 from superseriousbusiness/alpine+node_upstep (diff) | |
| parent | fix keys used to access storage items (diff) | |
| download | gotosocial-f6492d12d948507021bbe934de94e87e20464c01.tar.xz | |
Merge pull request #214 from NyaaaWhatsUpDoc/improvement/update-storage-library
add git.iim.gay/grufwub/go-store for storage backend, replacing blob.Storage
Diffstat (limited to 'internal/federation')
| -rw-r--r-- | internal/federation/dereferencing/dereferencer_test.go | 4 | ||||
| -rw-r--r-- | internal/federation/federator_test.go | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/internal/federation/dereferencing/dereferencer_test.go b/internal/federation/dereferencing/dereferencer_test.go index b4cb68e25..41909ec4d 100644 --- a/internal/federation/dereferencing/dereferencer_test.go +++ b/internal/federation/dereferencing/dereferencer_test.go @@ -24,11 +24,11 @@ import ( "io" "net/http" + "git.iim.gay/grufwub/go-store/kv" "github.com/go-fed/activity/streams" "github.com/go-fed/activity/streams/vocab" "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/blob" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" @@ -42,7 +42,7 @@ type DereferencerStandardTestSuite struct { config *config.Config db db.DB log *logrus.Logger - storage blob.Storage + storage *kv.KVStore testRemoteStatuses map[string]vocab.ActivityStreamsNote testRemoteAccounts map[string]vocab.ActivityStreamsPerson diff --git a/internal/federation/federator_test.go b/internal/federation/federator_test.go index cb21d44c2..7a76089d7 100644 --- a/internal/federation/federator_test.go +++ b/internal/federation/federator_test.go @@ -24,13 +24,13 @@ import ( "net/http/httptest" "testing" + "git.iim.gay/grufwub/go-store/kv" "github.com/go-fed/activity/pub" "github.com/go-fed/httpsig" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/blob" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/federation" @@ -45,7 +45,7 @@ type ProtocolTestSuite struct { config *config.Config db db.DB log *logrus.Logger - storage blob.Storage + storage *kv.KVStore typeConverter typeutils.TypeConverter accounts map[string]*gtsmodel.Account activities map[string]testrig.ActivityWithSignature @@ -65,7 +65,6 @@ func (suite *ProtocolTestSuite) SetupSuite() { func (suite *ProtocolTestSuite) SetupTest() { testrig.StandardDBSetup(suite.db, suite.accounts) - } // TearDownTest drops tables to make sure there's no data in the db @@ -75,7 +74,6 @@ func (suite *ProtocolTestSuite) TearDownTest() { // make sure PostInboxRequestBodyHook properly sets the inbox username and activity on the context func (suite *ProtocolTestSuite) TestPostInboxRequestBodyHook() { - // the activity we're gonna use activity := suite.activities["dm_for_zork"] @@ -106,7 +104,6 @@ func (suite *ProtocolTestSuite) TestPostInboxRequestBodyHook() { } func (suite *ProtocolTestSuite) TestAuthenticatePostInbox() { - // the activity we're gonna use activity := suite.activities["dm_for_zork"] sendingAccount := suite.accounts["remote_account_1"] |