From 7af5861d7ce58f60b222cf27f8b3833c7fff02cb Mon Sep 17 00:00:00 2001
From: Ofek Shaltiel <ofeks@platinum-sec.com>
Date: Wed, 14 Aug 2024 17:26:49 +0300
Subject: [PATCH] enforce list's push key type and export it

---
 src/lists.rs | 12 ++++++++----
 src/typed.rs | 19 ++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/lists.rs b/src/lists.rs
index 4bbed36..2cd6d84 100644
--- a/src/lists.rs
+++ b/src/lists.rs
@@ -1123,16 +1123,20 @@ impl CandyStore {
         &self,
         list_key: &B1,
         val: &B2,
-    ) -> Result<Uuid> {
+    ) -> Result<EncodableUuid> {
         self.owned_push_to_list_head(list_key.as_ref().to_owned(), val.as_ref().to_owned())
     }
 
     /// Owned version of [Self::push_to_list_head]
-    pub fn owned_push_to_list_head(&self, list_key: Vec<u8>, val: Vec<u8>) -> Result<Uuid> {
-        let uuid = Uuid::new_v4();
+    pub fn owned_push_to_list_head(
+        &self,
+        list_key: Vec<u8>,
+        val: Vec<u8>,
+    ) -> Result<EncodableUuid> {
+        let uuid = EncodableUuid::from(Uuid::new_v4());
         let status = self._insert_to_list(
             list_key,
-            uuid.as_bytes().to_vec(),
+            uuid.to_bytes::<LE>(),
             val,
             InsertMode::GetOrCreate,
             InsertPosition::Head,
diff --git a/src/typed.rs b/src/typed.rs
index 85baf7a..b52b4f6 100644
--- a/src/typed.rs
+++ b/src/typed.rs
@@ -1,6 +1,5 @@
 use anyhow::anyhow;
 use std::{borrow::Borrow, marker::PhantomData, sync::Arc};
-use uuid::Uuid;
 
 use crate::{
     insertion::{ReplaceStatus, SetStatus},
@@ -449,14 +448,15 @@ where
         self.store.owned_discard_list(list_key)
     }
 
-    // only available if K == Uuid
-    fn _push_head<Q1: ?Sized + Encode, Q2: ?Sized + Encode>(
+    /// Same as [CandyStore::push_to_list_head], but `list_key` is typed
+    pub fn push_head<Q1: ?Sized + Encode, Q2: ?Sized + Encode>(
         &self,
         list_key: &Q1,
         val: &Q2,
-    ) -> Result<Uuid>
+    ) -> Result<EncodableUuid>
     where
         L: Borrow<Q1>,
+        EncodableUuid: From<K>,
         V: Borrow<Q2>,
     {
         let list_key = Self::make_list_key(list_key);
@@ -464,14 +464,15 @@ where
         self.store.owned_push_to_list_head(list_key, val)
     }
 
-    // only available if K == Uuid
-    fn _push_tail<Q1: ?Sized + Encode, Q2: ?Sized + Encode>(
+    /// Same as [CandyStore::push_to_list_tail], but `list_key` is typed
+    pub fn push_tail<Q1: ?Sized + Encode, Q2: ?Sized + Encode>(
         &self,
         list_key: &Q1,
         val: &Q2,
     ) -> Result<EncodableUuid>
     where
         L: Borrow<Q1>,
+        EncodableUuid: From<K>,
         V: Borrow<Q2>,
     {
         let list_key = Self::make_list_key(list_key);
@@ -532,7 +533,7 @@ where
 /// and popping from either the head or the tail. The keys are auto-generated internally and are not exposed to
 /// the caller
 pub struct CandyTypedDeque<L, V> {
-    pub list: CandyTypedList<L, uuid::Bytes, V>,
+    pub list: CandyTypedList<L, EncodableUuid, V>,
 }
 
 impl<L, V> Clone for CandyTypedDeque<L, V> {
@@ -564,7 +565,7 @@ where
         L: Borrow<Q1>,
         V: Borrow<Q2>,
     {
-        self.list._push_head(list_key, val)?;
+        self.list.push_head(list_key, val)?;
         Ok(())
     }
 
@@ -578,7 +579,7 @@ where
         L: Borrow<Q1>,
         V: Borrow<Q2>,
     {
-        self.list._push_tail(list_key, val)?;
+        self.list.push_tail(list_key, val)?;
         Ok(())
     }