From a740dc80fe8a543ddc6d06860179d68e20758ed5 Mon Sep 17 00:00:00 2001
From: Nikita Vilunov <nikita@vilunov.me>
Date: Fri, 10 May 2024 15:52:00 +0200
Subject: [PATCH] wip

---
 config.toml                           |  3 +--
 crates/projection-irc/tests/lib.rs    |  6 ++----
 crates/projection-xmpp/src/testkit.rs | 26 ++++++++++++++++++++++----
 crates/projection-xmpp/tests/lib.rs   |  3 +--
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/config.toml b/config.toml
index 399a033..b4c9926 100644
--- a/config.toml
+++ b/config.toml
@@ -20,5 +20,4 @@ addresses = []
 [cluster.metadata]
 node_id = 0
 main_owner = 0
-test_owner = 0
-test2_owner = 0
+rooms = {}
diff --git a/crates/projection-irc/tests/lib.rs b/crates/projection-irc/tests/lib.rs
index 4ac98c0..9b29646 100644
--- a/crates/projection-irc/tests/lib.rs
+++ b/crates/projection-irc/tests/lib.rs
@@ -124,8 +124,7 @@ impl TestServer {
             metadata: ClusterMetadata {
                 node_id: 0,
                 main_owner: 0,
-                test_owner: 0,
-                test2_owner: 0,
+                rooms: Default::default(),
             },
         };
         let core = LavinaCore::new(metrics.clone(), cluster_config, storage.clone()).await?;
@@ -148,8 +147,7 @@ impl TestServer {
             metadata: ClusterMetadata {
                 node_id: 0,
                 main_owner: 0,
-                test_owner: 0,
-                test2_owner: 0,
+                rooms: Default::default(),
             },
         };
         let TestServer {
diff --git a/crates/projection-xmpp/src/testkit.rs b/crates/projection-xmpp/src/testkit.rs
index 3002c30..cdc078d 100644
--- a/crates/projection-xmpp/src/testkit.rs
+++ b/crates/projection-xmpp/src/testkit.rs
@@ -1,8 +1,10 @@
+use prometheus::Registry as MetricsRegistry;
+
 use crate::{Authenticated, XmppConnection};
-use lavina_core::player::{PlayerConnection, PlayerId};
+use lavina_core::clustering::{ClusterConfig, ClusterMetadata};
+use lavina_core::player::PlayerConnection;
 use lavina_core::repo::{Storage, StorageConfig};
 use lavina_core::LavinaCore;
-use prometheus::Registry as MetricsRegistry;
 use proto_xmpp::bind::{BindRequest, BindResponse, Jid, Name, Resource, Server};
 
 pub(crate) struct TestServer {
@@ -19,7 +21,15 @@ impl TestServer {
             db_path: ":memory:".into(),
         })
         .await?;
-        let core = LavinaCore::new(metrics.clone(), storage.clone()).await?;
+        let cluster_config = ClusterConfig {
+            metadata: ClusterMetadata {
+                node_id: 0,
+                main_owner: 0,
+                rooms: Default::default(),
+            },
+            addresses: vec![],
+        };
+        let core = LavinaCore::new(metrics.clone(), cluster_config, storage.clone()).await?;
         Ok(TestServer { metrics, storage, core })
     }
 
@@ -27,7 +37,15 @@ impl TestServer {
         self.core.shutdown().await?;
 
         let metrics = MetricsRegistry::new();
-        let core = LavinaCore::new(metrics.clone(), self.storage.clone()).await?;
+        let cluster_config = ClusterConfig {
+            metadata: ClusterMetadata {
+                node_id: 0,
+                main_owner: 0,
+                rooms: Default::default(),
+            },
+            addresses: vec![],
+        };
+        let core = LavinaCore::new(metrics.clone(), cluster_config, self.storage.clone()).await?;
 
         Ok(TestServer {
             metrics,
diff --git a/crates/projection-xmpp/tests/lib.rs b/crates/projection-xmpp/tests/lib.rs
index 6f8320c..411737c 100644
--- a/crates/projection-xmpp/tests/lib.rs
+++ b/crates/projection-xmpp/tests/lib.rs
@@ -167,8 +167,7 @@ impl TestServer {
             metadata: ClusterMetadata {
                 node_id: 0,
                 main_owner: 0,
-                test_owner: 0,
-                test2_owner: 0,
+                rooms: Default::default(),
             },
         };
         let core = LavinaCore::new(metrics.clone(), cluster_config, storage.clone()).await?;