Fixed same log problerm

updata version to 0.17.3
superbitcoin · Jul 23, 2018 · 1ba13f9 · 1ba13f9
1 parent befcf85
commit 1ba13f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CMakeModules/SbtcOptions.cmake b/CMakeModules/SbtcOptions.cmake
@@ -53,7 +53,7 @@ macro(configure_project)
 
 	SET(HAVE_BUILD_INFO 1)
 	SET(GIT_ARCHIVE 1)
-	SET(CLIENT_VERSION_BUILD 1)
+	SET(CLIENT_VERSION_BUILD 3)
 	SET(CLIENT_VERSION_MAJOR 0)
 	SET(CLIENT_VERSION_MINOR 17)
 	SET(CLIENT_VERSION_REVISION 0)

diff --git a/src/chaincontrol/chaincomponent.cpp b/src/chaincontrol/chaincomponent.cpp
@@ -2195,13 +2195,13 @@ void CChainComponent::ThreadImport()
             FILE *file = OpenBlockFile(pos, true);
             if (!file)
                 break; // This error is logged in OpenBlockFile
-            ILogFormat("Reindexing block file blk%05u.dat...", (unsigned int)iFile);
+            NLogFormat("Reindexing block file blk%05u.dat...", (unsigned int)iFile);
             LoadExternalBlockFile(Params(), file, &pos);
             iFile++;
         }
         cIndexManager.SetReIndexing(false);
         bReIndex = false;
-        ILogFormat("Reindexing finished");
+        NLogFormat("Reindexing finished");
     }
 
     if (cIndexManager.NeedInitGenesisBlock(Params()))
@@ -2220,12 +2220,12 @@ void CChainComponent::ThreadImport()
         if (file)
         {
             fs::path pathBootstrapOld = GetDataDir() / "bootstrap.dat.old";
-            ILogFormat("Importing bootstrap.dat...");
+            NLogFormat("Importing bootstrap.dat...");
             LoadExternalBlockFile(Params(), file, nullptr);
             RenameOver(pathBootstrap, pathBootstrapOld);
         } else
         {
-            ILogFormat("Warning: Could not open bootstrap file %s", pathBootstrap.string());
+            NLogFormat("Warning: Could not open bootstrap file %s", pathBootstrap.string());
         }
     }
 
@@ -2234,7 +2234,7 @@ void CChainComponent::ThreadImport()
         FILE *file = fsbridge::fopen(strFile, "rb");
         if (file)
         {
-            ILogFormat("Importing blocks file %s...", strFile);
+            NLogFormat("Importing blocks file %s...", strFile);
             LoadExternalBlockFile(Params(), file, nullptr);
         } else
         {
@@ -2252,7 +2252,7 @@ void CChainComponent::ThreadImport()
 
     if (Args().GetArg<bool>("-stopafterblockimport", false))
     {
-        ILogFormat("Stopping after block import");
+        NLogFormat("Stopping after block import");
         return;
     }
 }

diff --git a/src/contract-api/sbtcstate.cpp b/src/contract-api/sbtcstate.cpp
@@ -115,7 +115,7 @@ SbtcState::execute(EnvInfo const &_envInfo, SealEngineFace const &_sealEngine, S
         printfErrorLog(dev::eth::toTransactionException(_e));
         res.excepted = dev::eth::toTransactionException(_e);
         res.gasUsed = _t.gas();
-        const Consensus::Params &consensusParams = Params().GetConsensus();
+//        const Consensus::Params &consensusParams = Params().GetConsensus();
         //sbtc-vm force to clear
         //        if(chainActive.Height() < consensusParams.nFixUTXOCacheHFHeight  && _p != Permanence::Reverted){
         //            deleteAccounts(_sealEngine.deleteAddresses);