From 43cfe50bcf9ea7be40e0e0e9cbf4b1cb3058ed70 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@matrix.org>
Date: Tue, 5 Sep 2017 15:58:16 +0100
Subject: [PATCH] Remove deadcode

---
 .../matrix-org/dendrite/clientapi/readers/login.go    |  5 -----
 .../dendrite/cmd/create-room-events/main.go           |  7 -------
 .../dendrite/cmd/roomserver-integration-tests/main.go | 11 -----------
 3 files changed, 23 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/clientapi/readers/login.go b/src/github.com/matrix-org/dendrite/clientapi/readers/login.go
index 270b2e5ac..1f6b5071e 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/readers/login.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/readers/login.go
@@ -15,7 +15,6 @@
 package readers
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/matrix-org/dendrite/clientapi/auth"
@@ -121,7 +120,3 @@ func Login(
 		JSON: jsonerror.NotFound("Bad method"),
 	}
 }
-
-func makeUserID(localpart string, domain gomatrixserverlib.ServerName) string {
-	return fmt.Sprintf("@%s:%s", localpart, domain)
-}
diff --git a/src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go b/src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go
index a37c76856..c7b9d953b 100644
--- a/src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go
@@ -49,13 +49,6 @@ var (
 	format           = flag.String("Format", "InputRoomEvent", "The output format to use for the messages: InputRoomEvent or Event")
 )
 
-func defaulting(value, defaultValue string) string {
-	if value == "" {
-		return defaultValue
-	}
-	return value
-}
-
 // By default we use a private key of 0.
 const defaultKey = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 
diff --git a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
index 43305c2fe..a61342b42 100644
--- a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
@@ -271,17 +271,6 @@ func testRoomserver(input []string, wantOutput []string, checkQueries func(api.R
 	}
 }
 
-func canonicalJSONInput(jsonData []string) []string {
-	for i := range jsonData {
-		jsonBytes, err := gomatrixserverlib.CanonicalJSON([]byte(jsonData[i]))
-		if err != nil {
-			panic(err)
-		}
-		jsonData[i] = string(jsonBytes)
-	}
-	return jsonData
-}
-
 func equalJSON(a, b string) bool {
 	canonicalA, err := gomatrixserverlib.CanonicalJSON([]byte(a))
 	if err != nil {