Ironing out some problems with the ApiState serialisation

2 files changed, 6 insertions, 18 deletions

diff --git a/lockchain-core/src/users.rs b/lockchain-core/src/users.rs
index 0d5973c..880c7f4 100644
--- a/lockchain-core/src/users.rs
+++ b/lockchain-core/src/users.rs
@@ -21,7 +21,7 @@ use std::collections::HashMap;
 use {meta::MetaDomain, traits::AutoEncoder};
 
 /// Specifies access to a resource
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub enum Access {
     /// Allows specific access to an entire API
     Api,
@@ -32,7 +32,7 @@ pub enum Access {
 }
 
 /// Specifies the capabilities of a user
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub enum Role {
     Reader,
     Editor,
@@ -52,7 +52,7 @@ pub enum Role {
 /// changing the rules!
 ///
 /// An user can have multiple role-access pairs
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct User {
     name: String,
     pw_hash: String,
diff --git a/lockchain-http/src/state.rs b/lockchain-http/src/state.rs
index 78daf81..423e674 100644
--- a/lockchain-http/src/state.rs
+++ b/lockchain-http/src/state.rs
@@ -107,14 +107,8 @@ where
 {
     fn from(me: &'state ApiState<B, V>) -> Self {
         Self {
-            vaults: me
-                .vaults
-                .into_iter()
-                .fold(Vec::new(), |mut acc: Vec<String>, (k, v)| {
-                    acc.push(k);
-                    acc
-                }),
-            users: me.users.get_all().iter().map(|(_, v)| v).collect(),
+            vaults: me.vaults.iter().map(|(k, _)| k.clone()).collect(),
+            users: me.users.get_all().iter().map(|(_, v)| v.clone()).collect(),
         }
     }
 }
@@ -127,13 +121,7 @@ where
 {
     fn from(me: SerializedState) -> Self {
         Self {
-            vaults: me.vaults.into_iter().fold(
-                HashMap::new(),
-                |mut acc: HashMap<String, Option<V>>, k| {
-                    acc.insert(k, None);
-                    acc
-                },
-            ),
+            vaults: me.vaults.into_iter().map(|k| (k, None)).collect(),
             _phantom: PhantomData,
             ..Default::default()
         }