diff --git a/federationsender/federationsender.go b/federationsender/federationsender.go index 6ab5ce955..e25c27237 100644 --- a/federationsender/federationsender.go +++ b/federationsender/federationsender.go @@ -17,8 +17,8 @@ package federationsender import ( "github.com/matrix-org/dendrite/federationsender/api" "github.com/matrix-org/dendrite/federationsender/consumers" - "github.com/matrix-org/dendrite/federationsender/httpint" "github.com/matrix-org/dendrite/federationsender/internal" + "github.com/matrix-org/dendrite/federationsender/inthttp" "github.com/matrix-org/dendrite/federationsender/producers" "github.com/matrix-org/dendrite/federationsender/queue" "github.com/matrix-org/dendrite/federationsender/storage" @@ -67,7 +67,7 @@ func SetupFederationSenderComponent( } queryAPI := internal.NewFederationSenderInternalAPI(federationSenderDB, base.Cfg, roomserverProducer, federation, keyRing, statistics, queues) - httpint.AddRoutes(queryAPI, base.InternalAPIMux) + inthttp.AddRoutes(queryAPI, base.InternalAPIMux) return queryAPI } diff --git a/federationsender/httpint/client.go b/federationsender/inthttp/client.go similarity index 99% rename from federationsender/httpint/client.go rename to federationsender/inthttp/client.go index 6c532b6a1..8b3a106d8 100644 --- a/federationsender/httpint/client.go +++ b/federationsender/inthttp/client.go @@ -1,4 +1,4 @@ -package httpint +package inthttp import ( "context" diff --git a/federationsender/httpint/server.go b/federationsender/inthttp/server.go similarity index 99% rename from federationsender/httpint/server.go rename to federationsender/inthttp/server.go index f56aff57f..c94a14295 100644 --- a/federationsender/httpint/server.go +++ b/federationsender/inthttp/server.go @@ -1,4 +1,4 @@ -package httpint +package inthttp import ( "encoding/json" diff --git a/internal/basecomponent/base.go b/internal/basecomponent/base.go index 23c645b20..a1a908760 100644 --- a/internal/basecomponent/base.go +++ b/internal/basecomponent/base.go @@ -38,7 +38,7 @@ import ( appserviceAPI "github.com/matrix-org/dendrite/appservice/api" eduServerAPI "github.com/matrix-org/dendrite/eduserver/api" federationSenderAPI "github.com/matrix-org/dendrite/federationsender/api" - "github.com/matrix-org/dendrite/federationsender/httpint" + "github.com/matrix-org/dendrite/federationsender/inthttp" "github.com/matrix-org/dendrite/internal/config" roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" serverKeyAPI "github.com/matrix-org/dendrite/serverkeyapi/api" @@ -169,7 +169,7 @@ func (b *BaseDendrite) CreateHTTPEDUServerAPIs() eduServerAPI.EDUServerInputAPI // FederationSenderHTTPClient returns FederationSenderInternalAPI for hitting // the federation sender over HTTP func (b *BaseDendrite) FederationSenderHTTPClient() federationSenderAPI.FederationSenderInternalAPI { - f, err := httpint.NewFederationSenderClient(b.Cfg.FederationSenderURL(), b.httpClient) + f, err := inthttp.NewFederationSenderClient(b.Cfg.FederationSenderURL(), b.httpClient) if err != nil { logrus.WithError(err).Panic("NewFederationSenderInternalAPIHTTP failed", b.httpClient) }