Nit: Undo some of the changes of core#18710

This undoes some of the changes of the core backport #18710, to minimize the diff size (keeps more of our code in-tact).
bitcoin-cash-node · Jun 7, 2021 · 4c6aaf3 · 4c6aaf3
1 parent ae2c2fb
commit 4c6aaf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1891,7 +1891,8 @@ bool CChainState::ConnectBlock(const CBlock &block, CValidationState &state,
     CBlockUndo blockundo;
     blockundo.vtxundo.resize(block.vtx.size() - 1);
 
-    CCheckQueueControl<CScriptCheck> control(fScriptChecks ? &scriptcheckqueue : nullptr);
+    CCheckQueueControl<CScriptCheck> control(fScriptChecks ? &scriptcheckqueue
+                                                           : nullptr);
 
     // Add all outputs
     try {

diff --git a/src/validation.h b/src/validation.h
@@ -97,7 +97,7 @@ static constexpr unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB
 static constexpr unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB
 
 /** Maximum number of dedicated script-checking threads allowed */
-static const int MAX_SCRIPTCHECK_THREADS = 15;
+static constexpr int MAX_SCRIPTCHECK_THREADS = 15;
 /** -par default (number of script-checking threads, 0 = auto) */
 static constexpr int DEFAULT_SCRIPTCHECK_THREADS = 0;
 /**