From 5b928c96f92ccc6253cd7cacb88bd5816315ea19 Mon Sep 17 00:00:00 2001
From: Thomas Heck <t@b128.net>
Date: Sat, 20 Feb 2021 15:47:13 +0100
Subject: [PATCH] refactor: remove `Info` from core mut data

---
 crdt-enc/src/lib.rs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/crdt-enc/src/lib.rs b/crdt-enc/src/lib.rs
index e6f2b4c..70dfc62 100644
--- a/crdt-enc/src/lib.rs
+++ b/crdt-enc/src/lib.rs
@@ -212,7 +212,6 @@ struct CoreMutData<S> {
     state: StateWrapper<S>,
     read_states: HashSet<String>,
     read_remote_metas: HashSet<String>,
-    info: Option<Info>,
 }
 
 impl<S, ST, C, KC> Core<S, ST, C, KC>
@@ -243,7 +242,6 @@ where
             },
             read_states: HashSet::new(),
             read_remote_metas: HashSet::new(),
-            info: None,
         });
 
         let mut supported_data_versions = options.supported_data_versions;
@@ -289,13 +287,10 @@ where
             }
         };
 
-        let info = Info {
-            actor: local_meta.local_actor_id,
-        };
+        let actor = local_meta.local_actor_id;
 
         core.with_mut_data(|data| {
             data.local_meta = Some(local_meta);
-            data.info = Some(info.clone());
             Ok(())
         })?;
 
@@ -313,7 +308,7 @@ where
             let new_key = core.cryptor.gen_key().await?;
 
             let keys = core.with_mut_data(|data| {
-                data.keys.insert_latest_key(info.actor(), Key::new(new_key));
+                data.keys.insert_latest_key(actor, Key::new(new_key));
                 Ok(data.keys.clone())
             })?;
 
@@ -325,12 +320,12 @@ where
 
     pub fn info(self: &Arc<Self>) -> Info {
         self.with_mut_data(|data| {
-            let info = data
-                .info
+            let actor = data
+                .local_meta
                 .as_ref()
                 .expect("info not set, yet. Do not call this fn in the init phase")
-                .clone();
-            Ok(info)
+                .local_actor_id;
+            Ok(Info { actor })
         })
         .unwrap()
     }