Fix store (#3149)

benchmarks/Neo.Benchmarks/Benchmarks.cs

@@ -10,7 +10,6 @@
 // modifications are permitted.
 
 using Neo.Network.P2P.Payloads;
-using Neo.Persistence;
 using Neo.SmartContract;
 using Neo.VM;
 using System.Diagnostics;
@@ -20,7 +19,7 @@ namespace Neo;
 static class Benchmarks
 {
     private static readonly ProtocolSettings protocol = ProtocolSettings.Load("config.json");
-    private static readonly NeoSystem system = new(protocol, new MemoryStore());
+    private static readonly NeoSystem system = new(protocol, (string)null);
 
     public static void NeoIssue2725()
     {

src/Neo/NeoSystem.cs

@@ -98,6 +98,7 @@ public class NeoSystem : IDisposable
 
         private ImmutableList<object> services = ImmutableList<object>.Empty;
         private readonly IStore store;
+        private readonly IStoreProvider storageProvider;
         private ChannelsConfig start_message = null;
         private int suspend = 0;
 
@@ -113,22 +114,25 @@ static NeoSystem()
         /// Initializes a new instance of the <see cref="NeoSystem"/> class.
         /// </summary>
         /// <param name="settings">The protocol settings of the <see cref="NeoSystem"/>.</param>
-        /// <param name="storageEngine">The storage engine used to create the <see cref="IStore"/> objects. If this parameter is <see langword="null"/>, a default in-memory storage engine will be used.</param>
-        /// <param name="storagePath">The path of the storage. If <paramref name="storageEngine"/> is the default in-memory storage engine, this parameter is ignored.</param>
-        public NeoSystem(ProtocolSettings settings, string? storageEngine = null, string? storagePath = null) : this(settings, StoreFactory.GetStore(storageEngine ?? nameof(MemoryStore), storagePath))
+        /// <param name="storageProvider">The storage engine used to create the <see cref="IStoreProvider"/> objects. If this parameter is <see langword="null"/>, a default in-memory storage engine will be used.</param>
+        /// <param name="storagePath">The path of the storage. If <paramref name="storageProvider"/> is the default in-memory storage engine, this parameter is ignored.</param>
+        public NeoSystem(ProtocolSettings settings, string? storageProvider = null, string? storagePath = null) :
+            this(settings, StoreFactory.GetStoreProvider(storageProvider ?? nameof(MemoryStore)), storagePath)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NeoSystem"/> class.
         /// </summary>
         /// <param name="settings">The protocol settings of the <see cref="NeoSystem"/>.</param>
-        /// <param name="storage">The <see cref="IStore"/> to use.</param>
-        public NeoSystem(ProtocolSettings settings, IStore storage)
+        /// <param name="storageProvider">The <see cref="IStoreProvider"/> to use.</param>
+        /// <param name="storagePath">The path of the storage. If <paramref name="storageProvider"/> is the default in-memory storage engine, this parameter is ignored.</param>
+        public NeoSystem(ProtocolSettings settings, IStoreProvider storageProvider, string? storagePath = null)
         {
             this.Settings = settings;
             this.GenesisBlock = CreateGenesisBlock(settings);
-            this.store = storage;
+            this.storageProvider = storageProvider;
+            this.store = storageProvider.GetStore(storagePath);
             this.MemPool = new MemoryPool(this);
             this.Blockchain = ActorSystem.ActorOf(Ledger.Blockchain.Props(this));
             this.LocalNode = ActorSystem.ActorOf(Network.P2P.LocalNode.Props(this));
@@ -225,7 +229,7 @@ public void EnsureStopped(IActorRef actor)
         /// <returns>The loaded <see cref="IStore"/>.</returns>
         public IStore LoadStore(string path)
         {
-            return StoreFactory.GetStore(store.GetType().Name, path);
+            return storageProvider.GetStore(path);
         }
 
         /// <summary>

src/Neo/Persistence/MemoryStoreProvider.cs

@@ -0,0 +1,19 @@
+// Copyright (C) 2015-2024 The Neo Project.
+//
+// MemoryStoreProvider.cs file belongs to the neo project and is free
+// software distributed under the MIT software license, see the
+// accompanying file LICENSE in the main directory of the
+// repository or http://www.opensource.org/licenses/mit-license.php
+// for more details.
+//
+// Redistribution and use in source and binary forms with or without
+// modifications are permitted.
+
+namespace Neo.Persistence
+{
+    internal class MemoryStoreProvider : IStoreProvider
+    {
+        public string Name => nameof(MemoryStore);
+        public IStore GetStore(string path) => new MemoryStore();
+    }
+}

src/Neo/Persistence/StoreFactory.cs

@@ -15,12 +15,6 @@ namespace Neo.Persistence;
 
 public static class StoreFactory
 {
-    private class MemoryStoreProvider : IStoreProvider
-    {
-        public string Name => nameof(MemoryStore);
-        public IStore GetStore(string path) => new MemoryStore();
-    }
-
     private static readonly Dictionary<string, IStoreProvider> providers = new();
 
     static StoreFactory()
@@ -37,14 +31,29 @@ public static void RegisterProvider(IStoreProvider provider)
         providers.Add(provider.Name, provider);
     }
 
+    /// <summary>
+    /// Get store provider by name
+    /// </summary>
+    /// <param name="name">Name</param>
+    /// <returns>Store provider</returns>
+    public static IStoreProvider? GetStoreProvider(string name)
+    {
+        if (providers.TryGetValue(name, out var provider))
+        {
+            return provider;
+        }
+
+        return null;
+    }
+
     /// <summary>
     /// Get store from name
     /// </summary>
-    /// <param name="storageEngine">The storage engine used to create the <see cref="IStore"/> objects. If this parameter is <see langword="null"/>, a default in-memory storage engine will be used.</param>
-    /// <param name="path">The path of the storage. If <paramref name="storageEngine"/> is the default in-memory storage engine, this parameter is ignored.</param>
+    /// <param name="storageProvider">The storage engine used to create the <see cref="IStore"/> objects. If this parameter is <see langword="null"/>, a default in-memory storage engine will be used.</param>
+    /// <param name="path">The path of the storage. If <paramref name="storageProvider"/> is the default in-memory storage engine, this parameter is ignored.</param>
     /// <returns>The storage engine.</returns>
-    public static IStore GetStore(string storageEngine, string path)
+    public static IStore GetStore(string storageProvider, string path)
     {
-        return providers[storageEngine].GetStore(path);
+        return providers[storageProvider].GetStore(path);
     }
 }

tests/Neo.UnitTests/Ledger/UT_MemoryPool.cs

@@ -57,7 +57,7 @@ public void TestSetup()
             TimeProvider.ResetToDefault();
 
             // Create a MemoryPool with capacity of 100
-            _unit = new MemoryPool(new NeoSystem(TestProtocolSettings.Default with { MemoryPoolMaxTransactions = 100 }, new MemoryStore()));
+            _unit = new MemoryPool(new NeoSystem(TestProtocolSettings.Default with { MemoryPoolMaxTransactions = 100 }, storageProvider: (string)null));
 
             // Verify capacity equals the amount specified
             _unit.Capacity.Should().Be(100);
@@ -648,7 +648,7 @@ public void TestGetVerifiedTransactions()
         [TestMethod]
         public void TestReVerifyTopUnverifiedTransactionsIfNeeded()
         {
-            _unit = new MemoryPool(new NeoSystem(TestProtocolSettings.Default with { MemoryPoolMaxTransactions = 600 }, new MemoryStore()));
+            _unit = new MemoryPool(new NeoSystem(TestProtocolSettings.Default with { MemoryPoolMaxTransactions = 600 }, storageProvider: (string)null));
 
             AddTransaction(CreateTransaction(100000001));
             AddTransaction(CreateTransaction(100000001));

tests/Neo.UnitTests/Persistence/UT_MemoryStore.cs

@@ -19,6 +19,12 @@ namespace Neo.UnitTests.Persistence
     [TestClass]
     public class UT_MemoryStore
     {
+        [TestMethod]
+        public void LoadStoreTest()
+        {
+            Assert.IsInstanceOfType<MemoryStore>(TestBlockchain.TheNeoSystem.LoadStore("abc"));
+        }
+
         [TestMethod]
         public void StoreTest()
         {

tests/Neo.UnitTests/TestBlockchain.cs

@@ -22,10 +22,17 @@ public static class TestBlockchain
         public static readonly UInt160[] DefaultExtensibleWitnessWhiteList;
         private static readonly MemoryStore Store = new();
 
+        private class StoreProvider : IStoreProvider
+        {
+            public string Name => "TestProvider";
+
+            public IStore GetStore(string path) => Store;
+        }
+
         static TestBlockchain()
         {
             Console.WriteLine("initialize NeoSystem");
-            TheNeoSystem = new NeoSystem(TestProtocolSettings.Default, Store);
+            TheNeoSystem = new NeoSystem(TestProtocolSettings.Default, new StoreProvider());
         }
 
         internal static void ResetStore()