From 20bf0ed2425c4fabe5d16dbb9d32e49cb698e56e Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 16 Jun 2020 12:20:33 +0100 Subject: [PATCH] Fix server key API test --- serverkeyapi/serverkeyapi_test.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/serverkeyapi/serverkeyapi_test.go b/serverkeyapi/serverkeyapi_test.go index de6659ad5..953e91644 100644 --- a/serverkeyapi/serverkeyapi_test.go +++ b/serverkeyapi/serverkeyapi_test.go @@ -13,6 +13,7 @@ import ( "testing" "time" + "github.com/matrix-org/dendrite/federationapi/routing" "github.com/matrix-org/dendrite/internal/caching" "github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/serverkeyapi/api" @@ -72,7 +73,8 @@ func TestMain(m *testing.M) { s.config.SetDefaults() s.config.Matrix.ServerName = gomatrixserverlib.ServerName(s.name) s.config.Matrix.PrivateKey = testPriv - s.config.Matrix.KeyID = "ed25519:test" + s.config.Matrix.KeyID = serverKeyID + s.config.Matrix.KeyValidityPeriod = s.validity s.config.Database.ServerKey = config.DataSource("file::memory:") // Create a transport which redirects federation requests to @@ -83,7 +85,7 @@ func TestMain(m *testing.M) { // Create the federation client. s.fedclient = gomatrixserverlib.NewFederationClientWithTransport( - s.config.Matrix.ServerName, "ed25519:test", testPriv, transport, + s.config.Matrix.ServerName, serverKeyID, testPriv, transport, ) // Finally, build the server key APIs. @@ -112,15 +114,9 @@ func (m *MockRoundTripper) RoundTrip(req *http.Request) (res *http.Response, err return nil, fmt.Errorf("unexpected request path: %s", req.URL.Path) } - // Query the local keys for the server in question. - request := &api.QueryLocalKeysRequest{} - response := &api.QueryLocalKeysResponse{} - if err = s.api.QueryLocalKeys(context.Background(), request, response); err != nil { - return nil, err - } - - // Make a nice JSON response out of it. - body, err := json.MarshalIndent(response.ServerKeys, "", " ") + // Get the keys and JSON-ify them. + keys := routing.LocalKeys(s.config) + body, err := json.MarshalIndent(keys.JSON, "", " ") if err != nil { return nil, err }