Implement ExtraPublicRoomsProvider for p2p demos (#1180)

* Change API and rename to ExtraPublicRoomsProvider

* Make dendritejs work again

* Maybe make libp2p demo work again

* Linting

cmd/dendrite-demo-libp2p/main.go

@@ -1,6 +1,4 @@
-// Copyright 2017 Vector Creations Ltd
-// Copyright 2018 New Vector Ltd
-// Copyright 2019-2020 The Matrix.org Foundation C.I.C.
+// Copyright 2020 The Matrix.org Foundation C.I.C.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -162,13 +160,12 @@ func main() {
 		&base.Base, federation, rsAPI, keyRing,
 	)
 	rsAPI.SetFederationSenderAPI(fsAPI)
-	/* TODO:
-	publicRoomsDB, err := storage.NewPublicRoomsServerDatabaseWithPubSub(string(base.Base.Cfg.Database.PublicRoomsAPI), base.LibP2PPubsub, cfg.Matrix.ServerName)
-	if err != nil {
-		logrus.WithError(err).Panicf("failed to connect to public rooms db")
-	}
-	*/
 	stateAPI := currentstateserver.NewInternalAPI(base.Base.Cfg, base.Base.KafkaConsumer)
+	provider := newPublicRoomsProvider(base.LibP2PPubsub, rsAPI, stateAPI)
+	err = provider.Start()
+	if err != nil {
+		panic("failed to create new public rooms provider: " + err.Error())
+	}
 
 	monolith := setup.Monolith{
 		Config:        base.Base.Cfg,
@@ -180,13 +177,14 @@ func main() {
 		KafkaConsumer: base.Base.KafkaConsumer,
 		KafkaProducer: base.Base.KafkaProducer,
 
-		AppserviceAPI:       asAPI,
-		EDUInternalAPI:      eduInputAPI,
-		FederationSenderAPI: fsAPI,
-		RoomserverAPI:       rsAPI,
-		ServerKeyAPI:        serverKeyAPI,
-		StateAPI:            stateAPI,
-		UserAPI:             userAPI,
+		AppserviceAPI:          asAPI,
+		EDUInternalAPI:         eduInputAPI,
+		FederationSenderAPI:    fsAPI,
+		RoomserverAPI:          rsAPI,
+		ServerKeyAPI:           serverKeyAPI,
+		StateAPI:               stateAPI,
+		UserAPI:                userAPI,
+		ExtPublicRoomsProvider: provider,
 	}
 	monolith.AddAllPublicRoutes(base.Base.PublicAPIMux)