merge beta->master

[VerusCoin.git] / src / test-komodo / testutils.cpp

diff --git a/src/test-komodo/testutils.cpp b/src/test-komodo/testutils.cpp
index caf8054991bdb5efc36450551a7c438e10b57639..59ea4307aac7b53ab804bd033d888069d4af7ed7 100644 (file)
--- a/src/test-komodo/testutils.cpp
+++ b/src/test-komodo/testutils.cpp
@@ -47,10 +47,15 @@ void setupChain()
     COINBASE_MATURITY = 1;
     // Global mock time
     nMockTime = GetTime();
+    
+    // Unload
+    UnloadBlockIndex();
 
     // Init blockchain
     ClearDatadirCache();
     auto pathTemp = GetTempPath() / strprintf("test_komodo_%li_%i", GetTime(), GetRand(100000));
+    if (ASSETCHAINS_SYMBOL[0])
+        pathTemp = pathTemp / strprintf("_%s", ASSETCHAINS_SYMBOL);
     boost::filesystem::create_directories(pathTemp);
     mapArgs["-datadir"] = pathTemp.string();
     pblocktree = new CBlockTreeDB(1 << 20, true);
@@ -70,13 +75,9 @@ void generateBlock(CBlock *block)
 
     SetMockTime(nMockTime+=100);  // CreateNewBlock can fail if not enough time passes
 
-    char symbolPrefix = ASSETCHAINS_SYMBOL[0];
-    ASSETCHAINS_SYMBOL[0] = 0; // generate block fails otherwise
-
     try {
         UniValue out = generate(params, false);
         blockId.SetHex(out[0].getValStr());
-        ASSETCHAINS_SYMBOL[0] = symbolPrefix;
         if (block) ASSERT_TRUE(ReadBlockFromDisk(*block, mapBlockIndex[blockId], false));
     } catch (const UniValue& e) {
         FAIL() << "failed to create block: " << e.write().data();