diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-02-16 17:12:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:12:17 +0000 |
| commit | 5d74a1757f652f1e367a036f931e71bd3da612dd (patch) | |
| tree | 1eba4d67889667ce00575be5751c305e4759a9e5 /cmd/resolve-state | |
| parent | f448e8972a1a6974916afc3ab686b342eaf568e2 (diff) | |
Don't query for servers so often in /send (#1766)
* Look up servers less often, don't hit API for missing auth events unless there are actually missing auth events
* Remove ResolveConflictsAdhoc (since it is already in GMSL), other tweaks
* Update gomatrixserverlib to matrix-org/gomatrixserverlib#254
* Fix resolve-state
* Initialise t.servers on first use
Diffstat (limited to 'cmd/resolve-state')
| -rw-r--r-- | cmd/resolve-state/main.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/resolve-state/main.go b/cmd/resolve-state/main.go index efa58333..69c3489d 100644 --- a/cmd/resolve-state/main.go +++ b/cmd/resolve-state/main.go @@ -8,7 +8,6 @@ import ( "strconv" "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/roomserver/state" "github.com/matrix-org/dendrite/roomserver/storage" "github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/setup" @@ -105,7 +104,7 @@ func main() { } fmt.Println("Resolving state") - resolved, err := state.ResolveConflictsAdhoc( + resolved, err := gomatrixserverlib.ResolveConflicts( gomatrixserverlib.RoomVersion(*roomVersion), events, authEvents, |