From dba4c24c9328fa6388e564f9ef01eb65af54e804 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Mon, 20 Sep 2021 02:18:18 +0200
Subject: [PATCH] (Manually) simplify no_prefix/_de

---
 packages/storage-plus/src/map.rs | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/storage-plus/src/map.rs b/packages/storage-plus/src/map.rs
index bfd3673cf..9019104e1 100644
--- a/packages/storage-plus/src/map.rs
+++ b/packages/storage-plus/src/map.rs
@@ -8,8 +8,6 @@ use crate::helpers::query_raw;
 #[cfg(feature = "iterator")]
 use crate::keys::Prefixer;
 use crate::keys::PrimaryKey;
-#[cfg(feature = "iterator")]
-use crate::keys::{EmptyPrefix, Prefixer};
 use crate::path::Path;
 #[cfg(feature = "iterator")]
 use crate::prefix::{Bound, Pair2, Prefix};
@@ -135,7 +133,6 @@ impl<'a, K, T> Map<'a, K, T>
 where
     T: Serialize + DeserializeOwned,
     K: PrimaryKey<'a>,
-    K::NoPrefix: EmptyPrefix,
 {
     pub fn range<'c>(
         &self,
@@ -147,8 +144,7 @@ where
     where
         T: 'c,
     {
-        self.no_prefix(K::NoPrefix::new())
-            .range(store, min, max, order)
+        self.no_prefix().range(store, min, max, order)
     }
 
     pub fn keys<'c>(
@@ -161,8 +157,7 @@ where
     where
         T: 'c,
     {
-        self.no_prefix(K::NoPrefix::new())
-            .keys(store, min, max, order)
+        self.no_prefix().keys(store, min, max, order)
     }
 }
 
@@ -172,7 +167,6 @@ impl<'a, K, T> Map<'a, K, T>
 where
     T: Serialize + DeserializeOwned,
     K: PrimaryKey<'a> + Deserializable,
-    K::NoPrefix: EmptyPrefix,
 {
     pub fn range_de<'c>(
         &self,
@@ -185,8 +179,7 @@ where
         T: 'c,
         K::Output: 'c,
     {
-        self.no_prefix_de(K::NoPrefix::new())
-            .range_de(store, min, max, order)
+        self.no_prefix_de().range_de(store, min, max, order)
     }
 
     pub fn keys_de<'c>(
@@ -200,12 +193,11 @@ where
         T: 'c,
         K::Output: 'c,
     {
-        self.no_prefix_de(K::NoPrefix::new())
-            .keys_de(store, min, max, order)
+        self.no_prefix_de().keys_de(store, min, max, order)
     }
 
-    fn no_prefix_de(&self, p: K::NoPrefix) -> Prefix<T, K> {
-        Prefix::new(self.namespace, &p.prefix())
+    fn no_prefix_de(&self) -> Prefix<T, K> {
+        Prefix::new(self.namespace, &[])
     }
 }