[Neo Fix] fix the store crash issue (#3124)

* fix the store crash issue * remove loadstore * Clean changes --------- Co-authored-by: Fernando Diaz Toledano <[email protected]>
neo-project · Feb 8, 2024 · 95708b5 · 95708b5
1 parent 3e52756
commit 95708b5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/Neo.CLI/CLI/MainService.cs b/src/Neo.CLI/CLI/MainService.cs
@@ -377,8 +377,7 @@ public async void Start(CommandLineOptions options)
             ProtocolSettings protocol = ProtocolSettings.Load("config.json");
             CustomProtocolSettings(options, protocol);
             CustomApplicationSettings(options, Settings.Default);
-            var store = StoreFactory.GetStore(Settings.Default.Storage.Engine, string.Format(Settings.Default.Storage.Path, protocol.Network.ToString("X8")));
-            NeoSystem = new NeoSystem(protocol, store);
+            NeoSystem = new NeoSystem(protocol, Settings.Default.Storage.Engine, string.Format(Settings.Default.Storage.Path, protocol.Network.ToString("X8")));
             NeoSystem.AddService(this);
 
             LocalNode = NeoSystem.LocalNode.Ask<LocalNode>(new LocalNode.GetInstance()).Result;

diff --git a/src/Neo/NeoSystem.cs b/src/Neo/NeoSystem.cs
@@ -109,6 +109,16 @@ static NeoSystem()
             Plugin.LoadPlugins();
         }
 
+        /// <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="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))
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="NeoSystem"/> class.
         /// </summary>
@@ -208,16 +218,6 @@ public void EnsureStopped(IActorRef actor)
             inbox.Receive(TimeSpan.FromMinutes(5));
         }
 
-        /// <summary>
-        /// Loads an <see cref="IStore"/> at the specified path.
-        /// </summary>
-        /// <param name="path">The path of the storage.</param>
-        /// <returns>The loaded <see cref="IStore"/>.</returns>
-        public IStore LoadStore(string path)
-        {
-            return StoreFactory.GetStore(store.GetType().Name, path);
-        }
-
         /// <summary>
         /// Resumes the startup process of <see cref="LocalNode"/>.
         /// </summary>

diff --git a/src/Neo/Persistence/StoreFactory.cs b/src/Neo/Persistence/StoreFactory.cs
@@ -29,9 +29,7 @@ static StoreFactory()
         RegisterProvider(memProvider);
 
         // Default cases
-
         providers.Add("", memProvider);
-        providers.Add(null, memProvider);
     }
 
     public static void RegisterProvider(IStoreProvider provider)