more test fixes

Author: mdnight

clientapi/routing/key_crosssigning_test.go

@@ -10,8 +10,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/element-hq/dendrite/userapi/types"
-
 	"github.com/element-hq/dendrite/setup/config"
 	"github.com/element-hq/dendrite/test"
 	"github.com/element-hq/dendrite/test/testrig"
@@ -134,9 +132,7 @@ func Test_UploadCrossSigningDeviceKeys_Unauthorised(t *testing.T) {
 		},
 		queryMasterKeysData: map[string]api.QueryMasterKeysResponse{
 			"@user:example.com": {
-				Key: &types.CrossSigningKey{
-					KeyData: spec.Base64Bytes("key1"),
-				},
+				Key: spec.Base64Bytes("key1"),
 			},
 		},
 	}
@@ -200,9 +196,7 @@ func Test_UploadCrossSigningDeviceKeys_ExistingKeysMismatch(t *testing.T) {
 		},
 		queryMasterKeysData: map[string]api.QueryMasterKeysResponse{
 			"@user:example.com": {
-				Key: &types.CrossSigningKey{
-					KeyData: spec.Base64Bytes("different_key"),
-				},
+				Key: spec.Base64Bytes("different_key"),
 			},
 		},
 	}

userapi/storage/postgres/cross_signing_keys_table.go

@@ -38,7 +38,7 @@ const selectCrossSigningKeysForUserAndKeyTypeSQL = "" +
 
 const upsertCrossSigningKeysForUserSQL = "" +
 	"INSERT INTO keyserver_cross_signing_keys (user_id, key_type, key_data)" +
-	" VALUES($1, $2, $3, $4)" +
+	" VALUES($1, $2, $3)" +
 	" ON CONFLICT (user_id, key_type) DO UPDATE SET key_data = $3"
 
 type crossSigningKeysStatements struct {