notedeck

commit 79ac3b0d14136c70c6c77233c5405b5591914cc9
parent 499bac5ca48ff0f9c6481099f862090852fea70f
Author: kernelkind <kernelkind@gmail.com>
Date:   Sat, 29 Mar 2025 20:02:32 -0400

token serialize user account

Signed-off-by: kernelkind <kernelkind@gmail.com>

Diffstat:
M
crates/notedeck/src/user_account.rs
 | 
61
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--

1 file changed, 59 insertions(+), 2 deletions(-)
diff --git a/crates/notedeck/src/user_account.rs b/crates/notedeck/src/user_account.rs
@@ -1,5 +1,5 @@
 use enostr::Keypair;
-use tokenator::TokenSerializable;
+use tokenator::{ParseError, TokenParser, TokenSerializable};
 
 pub struct UserAccount {
     pub key: Keypair,
@@ -11,14 +11,71 @@ impl UserAccount {
     }
 }
 
+enum UserAccountRoute {
+    Key(Keypair),
+}
+
 impl TokenSerializable for UserAccount {
     fn parse_from_tokens<'a>(
         parser: &mut tokenator::TokenParser<'a>,
     ) -> Result<Self, tokenator::ParseError<'a>> {
-        Ok(UserAccount::new(Keypair::parse_from_tokens(parser)?))
+        let mut m_key = None;
+
+        loop {
+            let res = TokenParser::alt(
+                parser,
+                &[|p| Ok(UserAccountRoute::Key(Keypair::parse_from_tokens(p)?))],
+            );
+
+            match res {
+                Ok(UserAccountRoute::Key(key)) => m_key = Some(key),
+                Err(ParseError::AltAllFailed) => break,
+                Err(_) => {}
+            }
+
+            if m_key.is_some() {
+                break;
+            }
+        }
+
+        let Some(key) = m_key else {
+            return Err(ParseError::DecodeFailed);
+        };
+
+        Ok(UserAccount { key })
     }
 
     fn serialize_tokens(&self, writer: &mut tokenator::TokenWriter) {
         self.key.serialize_tokens(writer);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use enostr::FullKeypair;
+    use tokenator::{TokenParser, TokenSerializable, TokenWriter};
+
+    use super::UserAccount;
+
+    #[test]
+    fn test_user_account_serialize_deserialize() {
+        let kp = FullKeypair::generate();
+        let acc = UserAccount {
+            key: kp.to_keypair(),
+        };
+
+        let mut writer = TokenWriter::new("\t");
+        acc.serialize_tokens(&mut writer);
+
+        let serialized = writer.str();
+
+        let data = &serialized.split("\t").collect::<Vec<&str>>();
+        let mut parser = TokenParser::new(data);
+        let m_new_acc = UserAccount::parse_from_tokens(&mut parser);
+
+        assert!(m_new_acc.is_ok());
+        let new_acc = m_new_acc.unwrap();
+
+        assert_eq!(acc.key, new_acc.key);
+    }
+}