From ba19d86d47abb647e26875ffbf3d49514ec73e63 Mon Sep 17 00:00:00 2001
From: terrill <314156936@qq.com>
Date: Tue, 3 Jul 2018 10:40:31 +0800
Subject: [PATCH] add encryptoapi to main in monolith server

---
 .../matrix-org/dendrite/cmd/dendrite-monolith-server/main.go   | 3 +++
 src/github.com/matrix-org/dendrite/encryptoapi/encryptoapi.go  | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
index 3ffc833ea..301de9c9b 100644
--- a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
@@ -34,6 +34,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/sirupsen/logrus"
+	"github.com/matrix-org/dendrite/encryptoapi"
 )
 
 var (
@@ -56,6 +57,8 @@ func main() {
 
 	alias, input, query := roomserver.SetupRoomServerComponent(base)
 
+	encryptoapi.SetupEcryptoapi(base, accountDB, deviceDB)
+
 	clientapi.SetupClientAPIComponent(
 		base, deviceDB, accountDB,
 		federation, &keyRing, alias, input, query,
diff --git a/src/github.com/matrix-org/dendrite/encryptoapi/encryptoapi.go b/src/github.com/matrix-org/dendrite/encryptoapi/encryptoapi.go
index dfb746d85..77fd7dc46 100644
--- a/src/github.com/matrix-org/dendrite/encryptoapi/encryptoapi.go
+++ b/src/github.com/matrix-org/dendrite/encryptoapi/encryptoapi.go
@@ -31,7 +31,6 @@ func SetupEcryptoapi(
 	base *basecomponent.BaseDendrite,
 	accountsDB *accounts.Database,
 	deviceDB *devices.Database,
-
 ) {
 
 	encryptionDB, err := storage.NewDatabase(string(base.Cfg.Database.EncryptAPI))