Neil Alexander
5e609796c9
Fix internal cache stuff again
2020-06-16 12:11:51 +01:00
Neil Alexander
3d8d9ed50f
Partially revert "Move responsibility for generating local keys into server key API, don't register prom in caches unless needed, start tests"
...
This reverts commit d7eb54c5b3
2020-06-16 12:06:15 +01:00
Neil Alexander
c4e5c69870
Merge branch 'master' into neilalexander/keysagain
2020-06-15 17:19:49 +01:00
Kegsay
7c36fb78a7
Fix rooms v3 url paths for good - with tests ( #1130 )
...
* Fix rooms v3 url paths for good - with tests
- Add a test rig around `federationapi` to test routing.
- Use `JSONVerifier` over `KeyRing` so we can stub things out more easily.
- Add `test.NopJSONVerifier` which verifies nothing.
- Add `base.BaseMux` which is the original `mux.Router` used to spawn public/internal routers.
- Listen on `base.BaseMux` and not the default serve mux as it cleans paths which we don't want.
- Factor out `ListenAndServe` to `test.ListenAndServe` and add flag for listening on TLS.
* Fix comments
* Linting
2020-06-15 16:57:59 +01:00
Neil Alexander
bf6faa4290
Merge branch 'master' into neilalexander/keysagain
2020-06-15 15:11:46 +01:00
Kegsay
ecd7accbad
Rehuffle where things are in the internal package ( #1122 )
...
renamed: internal/eventcontent.go -> internal/eventutil/eventcontent.go
renamed: internal/events.go -> internal/eventutil/events.go
renamed: internal/types.go -> internal/eventutil/types.go
renamed: internal/http/http.go -> internal/httputil/http.go
renamed: internal/httpapi.go -> internal/httputil/httpapi.go
renamed: internal/httpapi_test.go -> internal/httputil/httpapi_test.go
renamed: internal/httpapis/paths.go -> internal/httputil/paths.go
renamed: internal/routing.go -> internal/httputil/routing.go
renamed: internal/basecomponent/base.go -> internal/setup/base.go
renamed: internal/basecomponent/flags.go -> internal/setup/flags.go
renamed: internal/partition_offset_table.go -> internal/sqlutil/partition_offset_table.go
renamed: internal/postgres.go -> internal/sqlutil/postgres.go
renamed: internal/postgres_wasm.go -> internal/sqlutil/postgres_wasm.go
renamed: internal/sql.go -> internal/sqlutil/sql.go
2020-06-12 14:55:57 +01:00
