This commit is contained in:
Kegan Dougal 2020-06-12 17:55:29 +01:00
parent 35009330b4
commit 21633035f9
2 changed files with 6 additions and 6 deletions

View file

@ -16,11 +16,11 @@ package userapi
import (
"github.com/gorilla/mux"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/internal"
"github.com/matrix-org/dendrite/userapi/inthttp"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
"github.com/matrix-org/gomatrixserverlib"
)
@ -34,8 +34,8 @@ func AddInternalRoutes(router *mux.Router, intAPI api.UserInternalAPI) {
// can call functions directly on the returned API or via an HTTP interface using AddInternalRoutes.
func NewInternalAPI(accountDB accounts.Database, deviceDB devices.Database, serverName gomatrixserverlib.ServerName) api.UserInternalAPI {
return &internal.UserInternalAPI{
AccountDB: accountDB,
DeviceDB: deviceDB,
AccountDB: accountDB,
DeviceDB: deviceDB,
ServerName: serverName,
}
}

View file

@ -127,7 +127,7 @@ func listenAndServe(t *testing.T, router *mux.Router) (apiURL string, cancel fun
srv.Handler = router
err := srv.Serve(listener)
if err != nil && err != http.ErrServerClosed {
t.Fatalf("Listen failed: %s", err)
t.Logf("Listen failed: %s", err)
}
}()