Merge branch 'master' into plugins

neo-project · Dec 2, 2019 · 24ddfd6 · 24ddfd6
2 parents f03b592 + e552255
commit 24ddfd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/neo/NeoSystem.cs b/src/neo/NeoSystem.cs
@@ -33,7 +33,9 @@ public class NeoSystem : IDisposable
         public NeoSystem(string storageEngine = null)
         {
             Plugin.LoadPlugins(this);
-            this.store = storageEngine is null ? new MemoryStore() : Plugin.Storages[storageEngine].GetStore();
+            this.store = string.IsNullOrEmpty(storageEngine) || storageEngine == nameof(MemoryStore)
+                ? new MemoryStore()
+                : Plugin.Storages[storageEngine].GetStore();
             this.Blockchain = ActorSystem.ActorOf(Ledger.Blockchain.Props(this, store));
             this.LocalNode = ActorSystem.ActorOf(Network.P2P.LocalNode.Props(this));
             this.TaskManager = ActorSystem.ActorOf(Network.P2P.TaskManager.Props(this));

diff --git a/tests/neo.UnitTests/Ledger/UT_Blockchain.cs b/tests/neo.UnitTests/Ledger/UT_Blockchain.cs
@@ -54,12 +54,6 @@ public void Initialize()
             Blockchain.Singleton.MemPool.TryAdd(txSample.Hash, txSample);
         }
 
-        [TestMethod]
-        public void TestConstructor()
-        {
-            system.ActorSystem.ActorOf(Blockchain.Props(system, Blockchain.Singleton.Store)).Should().NotBeSameAs(system.Blockchain);
-        }
-
         [TestMethod]
         public void TestContainsBlock()
         {