From dda2c9ab1cfcd28f2d39e547b94e5e9172ce1995 Mon Sep 17 00:00:00 2001 From: tsmethurst Date: Mon, 26 Apr 2021 21:22:34 +0200 Subject: [PATCH] linting, fmt --- internal/federation/protocol_test.go | 2 +- internal/federation/util.go | 13 ++++++------- testrig/testmodels.go | 1 + testrig/transportcontroller.go | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/federation/protocol_test.go b/internal/federation/protocol_test.go index 8147808a6..10ed417e2 100644 --- a/internal/federation/protocol_test.go +++ b/internal/federation/protocol_test.go @@ -55,7 +55,7 @@ func (suite *ProtocolTestSuite) SetupSuite() { suite.config = testrig.NewTestConfig() suite.db = testrig.NewTestDB() suite.log = testrig.NewTestLog() - suite.tc = testrig.NewTestTransportController(suite.db, testrig.NewMockHTTPClient(func(req *http.Request)(*http.Response, error) { + suite.tc = testrig.NewTestTransportController(suite.db, testrig.NewMockHTTPClient(func(req *http.Request) (*http.Response, error) { return nil, nil })) suite.activities = testrig.NewTestActivities() diff --git a/internal/federation/util.go b/internal/federation/util.go index e1367b9e8..f9cdce1bd 100644 --- a/internal/federation/util.go +++ b/internal/federation/util.go @@ -37,7 +37,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/transport" ) - /* publicKeyer is BORROWED DIRECTLY FROM https://github.com/go-fed/apcore/blob/master/ap/util.go Thank you @cj@mastodon.technology ! <3 @@ -50,8 +49,8 @@ type publicKeyer interface { getPublicKeyFromResponse is BORROWED DIRECTLY FROM https://github.com/go-fed/apcore/blob/master/ap/util.go Thank you @cj@mastodon.technology ! <3 */ -func getPublicKeyFromResponse(c context.Context, b []byte, keyId *url.URL) (p crypto.PublicKey, err error) { - m := make(map[string]interface{}, 0) +func getPublicKeyFromResponse(c context.Context, b []byte, keyID *url.URL) (p crypto.PublicKey, err error) { + m := make(map[string]interface{}) err = json.Unmarshal(b, &m) if err != nil { return @@ -77,19 +76,19 @@ func getPublicKeyFromResponse(c context.Context, b []byte, keyId *url.URL) (p cr continue } pkValue := pkpIter.Get() - var pkId *url.URL - pkId, err = pub.GetId(pkValue) + var pkID *url.URL + pkID, err = pub.GetId(pkValue) if err != nil { return } - if pkId.String() != keyId.String() { + if pkID.String() != keyID.String() { continue } pkpFound = pkValue break } if pkpFound == nil { - err = fmt.Errorf("cannot find publicKey with id: %s", keyId) + err = fmt.Errorf("cannot find publicKey with id: %s", keyID) return } pkPemProp := pkpFound.GetW3IDSecurityV1PublicKeyPem() diff --git a/testrig/testmodels.go b/testrig/testmodels.go index c50de9e9d..56d3f87dd 100644 --- a/testrig/testmodels.go +++ b/testrig/testmodels.go @@ -998,6 +998,7 @@ func NewTestFaves() map[string]*gtsmodel.StatusFave { } } +// NewTestActivities returns a bunch of pub.Activity types for use in testing the federation protocols. func NewTestActivities() map[string]pub.Activity { dmForZork := newNote( URLMustParse("https://fossbros-anonymous.io/users/foss_satan/statuses/5424b153-4553-4f30-9358-7b92f7cd42f6"), diff --git a/testrig/transportcontroller.go b/testrig/transportcontroller.go index c46ec5dea..00b6485ae 100644 --- a/testrig/transportcontroller.go +++ b/testrig/transportcontroller.go @@ -43,15 +43,15 @@ func NewTestTransportController(db db.DB, client pub.HttpClient) transport.Contr // NewMockHTTPClient returns a client that conforms to the pub.HttpClient interface, // but will always just execute the given `do` function, allowing responses to be mocked. func NewMockHTTPClient(do func(req *http.Request) (*http.Response, error)) pub.HttpClient { - return &mockHttpClient{ + return &mockHTTPClient{ do: do, } } -type mockHttpClient struct { +type mockHTTPClient struct { do func(req *http.Request) (*http.Response, error) } -func (m *mockHttpClient) Do(req *http.Request) (*http.Response, error) { +func (m *mockHTTPClient) Do(req *http.Request) (*http.Response, error) { return m.do(req) }