mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-14 05:12:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Run goimports

Browse source
This commit is contained in:
Till Faelligen 2024-12-21 21:22:08 +01:00
parent 9a3d4b0951
commit aa44dfc450
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
clientapi/routing/key_crosssigning.go
View file

@ -8,11 +8,12 @@ package routing
import ( import (
"context" "context"
"github.com/matrix-org/gomatrixserverlib/fclient"
"github.com/sirupsen/logrus"
"net/http" "net/http"
"time" "time"
"github.com/matrix-org/gomatrixserverlib/fclient"
"github.com/sirupsen/logrus"
"github.com/element-hq/dendrite/clientapi/auth" "github.com/element-hq/dendrite/clientapi/auth"
"github.com/element-hq/dendrite/clientapi/auth/authtypes" "github.com/element-hq/dendrite/clientapi/auth/authtypes"
"github.com/element-hq/dendrite/clientapi/httputil" "github.com/element-hq/dendrite/clientapi/httputil"
@ -132,7 +133,7 @@ func UploadCrossSigningDeviceKeys(
} }
} }
func keysDiffer(existingMasterKey fclient.CrossSigningKey, keyResp api.QueryKeysResponse, uploadReq *crossSigningRequest, userID string, ) bool { func keysDiffer(existingMasterKey fclient.CrossSigningKey, keyResp api.QueryKeysResponse, uploadReq *crossSigningRequest, userID string) bool {
masterKeyEqual := existingMasterKey.Equal(&uploadReq.MasterKey) masterKeyEqual := existingMasterKey.Equal(&uploadReq.MasterKey)
if !masterKeyEqual { if !masterKeyEqual {
return true return true

9
clientapi/routing/key_crosssigning_test.go
View file

@ -5,6 +5,11 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http"
"net/http/httptest"
"strings"
"testing"
"github.com/element-hq/dendrite/setup/config" "github.com/element-hq/dendrite/setup/config"
"github.com/element-hq/dendrite/test" "github.com/element-hq/dendrite/test"
"github.com/element-hq/dendrite/test/testrig" "github.com/element-hq/dendrite/test/testrig"
@ -12,10 +17,6 @@ import (
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/gomatrixserverlib/fclient" "github.com/matrix-org/gomatrixserverlib/fclient"
"github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/gomatrixserverlib/spec"
"net/http"
"net/http/httptest"
"strings"
"testing"
) )
type mockKeyAPI struct { type mockKeyAPI struct {