[AndrewFerr]

This merges matrix-org#935 with main and adapts the tests to matrix-org#928.

To see how this PR compares to matrix-org#935, one way is to compare the diffs of each PR, like so:

diff <(git diff --merge-base main barodeur/msc4140-authenticated-assertions) <(git diff main AndrewFerr/msc4140-authenticated-assertions_review)

< index 1d9f6db..4994885 100644
---
> index e974d75..ea9c766 100644
5,6c5,6
< @@ -62,6 +62,44 @@ func TestDelayedEvents(t *testing.T) {
<  		})
---
> @@ -90,6 +90,43 @@ func TestDelayedEvents(t *testing.T) {
>  		matchDelayedEvents(t, user, delayedEventsNumberEqual(0))
16,18c16,17
< +			getPathForState(roomID, eventType, "to_manage_without_a_token"),
< +			client.WithJSONBody(t, map[string]interface{}{}),
< +			getDelayQueryParam("100000"),
---
> +			getPathForDelayedEvent(roomID, eventType, "txn-delayed-mgmt-requires-auth"),
> +			client.WithJSONBody(t, getDelayedStateEventBody(100000, "to_manage_without_a_token", map[string]interface{}{})),
50c49
< @@ -243,6 +281,76 @@ func TestDelayedEvents(t *testing.T) {
---
> @@ -270,6 +307,75 @@ func TestDelayedEvents(t *testing.T) {
67,68c66,67
< +			getPathForState(roomID, eventType, stateKey),
< +			client.WithJSONBody(t, map[string]interface{}{
---
> +			getPathForDelayedEvent(roomID, eventType, "txn-delayed-mgmt-only-for-self"),
> +			client.WithJSONBody(t, getDelayedStateEventBody(1500, stateKey, map[string]interface{}{
70,71c69
< +			}),
< +			getDelayQueryParam("1500"),
---
> +			})),