Fix MemoryStore (#2759)

neo-project · May 31, 2022 · 2fda404 · 2fda404
1 parent bc28b21
commit 2fda404
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 36 deletions.
diff --git a/src/neo/Persistence/Helper.cs b/src/neo/Persistence/Helper.cs
diff --git a/src/neo/Persistence/MemorySnapshot.cs b/src/neo/Persistence/MemorySnapshot.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2021 The Neo Project.
+// Copyright (C) 2015-2022 The Neo Project.
 // 
 // The neo is free software distributed under the MIT software license, 
 // see the accompanying file LICENSE in the main directory of the
@@ -40,7 +40,7 @@ public void Commit()
 
         public void Delete(byte[] key)
         {
-            writeBatch[key.EnsureNotNull()] = null;
+            writeBatch[key] = null;
         }
 
         public void Dispose()
@@ -49,7 +49,7 @@ public void Dispose()
 
         public void Put(byte[] key, byte[] value)
         {
-            writeBatch[key.EnsureNotNull()] = value;
+            writeBatch[key[..]] = value[..];
         }
 
         public IEnumerable<(byte[] Key, byte[] Value)> Seek(byte[] keyOrPrefix, SeekDirection direction = SeekDirection.Forward)
@@ -59,18 +59,18 @@ public void Put(byte[] key, byte[] value)
             if (keyOrPrefix?.Length > 0)
                 records = records.Where(p => comparer.Compare(p.Key, keyOrPrefix) >= 0);
             records = records.OrderBy(p => p.Key, comparer);
-            return records.Select(p => (p.Key, p.Value));
+            return records.Select(p => (p.Key[..], p.Value[..]));
         }
 
         public byte[] TryGet(byte[] key)
         {
-            immutableData.TryGetValue(key.EnsureNotNull(), out byte[] value);
-            return value;
+            immutableData.TryGetValue(key, out byte[] value);
+            return value?[..];
         }
 
         public bool Contains(byte[] key)
         {
-            return innerData.ContainsKey(key.EnsureNotNull());
+            return immutableData.ContainsKey(key);
         }
     }
 }
diff --git a/src/neo/Persistence/MemoryStore.cs b/src/neo/Persistence/MemoryStore.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2021 The Neo Project.
+// Copyright (C) 2015-2022 The Neo Project.
 // 
 // The neo is free software distributed under the MIT software license, 
 // see the accompanying file LICENSE in the main directory of the
@@ -24,7 +24,7 @@ public class MemoryStore : IStore
 
         public void Delete(byte[] key)
         {
-            innerData.TryRemove(key.EnsureNotNull(), out _);
+            innerData.TryRemove(key, out _);
         }
 
         public void Dispose()
@@ -38,7 +38,7 @@ public ISnapshot GetSnapshot()
 
         public void Put(byte[] key, byte[] value)
         {
-            innerData[key.EnsureNotNull()] = value;
+            innerData[key[..]] = value[..];
         }
 
         public IEnumerable<(byte[] Key, byte[] Value)> Seek(byte[] keyOrPrefix, SeekDirection direction = SeekDirection.Forward)
@@ -51,18 +51,18 @@ public void Put(byte[] key, byte[] value)
                 records = records.Where(p => comparer.Compare(p.Key, keyOrPrefix) >= 0);
             records = records.OrderBy(p => p.Key, comparer);
             foreach (var pair in records)
-                yield return (pair.Key, pair.Value);
+                yield return (pair.Key[..], pair.Value[..]);
         }
 
         public byte[] TryGet(byte[] key)
         {
-            innerData.TryGetValue(key.EnsureNotNull(), out byte[] value);
-            return value;
+            innerData.TryGetValue(key, out byte[] value);
+            return value?[..];
         }
 
         public bool Contains(byte[] key)
         {
-            return innerData.ContainsKey(key.EnsureNotNull());
+            return innerData.ContainsKey(key);
         }
     }
 }