diff options
| -rwxr-xr-x | contrib/guix/guix-build | 2 | ||||
| -rw-r--r-- | src/test/fuzz/coins_view.cpp | 2 | ||||
| -rw-r--r-- | src/validation.cpp | 2 | ||||
| -rw-r--r-- | src/validation.h | 2 | ||||
| -rwxr-xr-x | test/functional/feature_init.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index 694f2ff1fa..98381f3e24 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -239,7 +239,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f time-machine() { # shellcheck disable=SC2086 guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \ - --commit=fa17abf1af09570708daa28dd40ffbc932ebe25c \ + --commit=6ba510d76d6847065be725e958718002f3b13c7a \ --cores="$JOBS" \ --keep-failed \ --fallback \ diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp index 5b85ccff83..994b4b9e49 100644 --- a/src/test/fuzz/coins_view.cpp +++ b/src/test/fuzz/coins_view.cpp @@ -273,7 +273,7 @@ FUZZ_TARGET_INIT(coins_view, initialize_coins_view) CCoinsStats stats{CoinStatsHashType::HASH_SERIALIZED}; bool expected_code_path = false; try { - (void)GetUTXOStats(&coins_view_cache, WITH_LOCK(::cs_main, return std::ref(g_setup->m_node.chainman->m_blockman)), stats); + (void)GetUTXOStats(&coins_view_cache, g_setup->m_node.chainman->m_blockman, stats); } catch (const std::logic_error&) { expected_code_path = true; } diff --git a/src/validation.cpp b/src/validation.cpp index 47b931a920..5deb44699a 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4873,7 +4873,7 @@ bool ChainstateManager::PopulateAndValidateSnapshot( // about the snapshot_chainstate. CCoinsViewDB* snapshot_coinsdb = WITH_LOCK(::cs_main, return &snapshot_chainstate.CoinsDB()); - if (!GetUTXOStats(snapshot_coinsdb, WITH_LOCK(::cs_main, return std::ref(m_blockman)), stats, breakpoint_fnc)) { + if (!GetUTXOStats(snapshot_coinsdb, m_blockman, stats, breakpoint_fnc)) { LogPrintf("[snapshot] failed to generate coins stats\n"); return false; } diff --git a/src/validation.h b/src/validation.h index fdc4e73b0a..edbd68f783 100644 --- a/src/validation.h +++ b/src/validation.h @@ -828,7 +828,7 @@ public: std::thread m_load_block; //! A single BlockManager instance is shared across each constructed //! chainstate to avoid duplicating block metadata. - node::BlockManager m_blockman GUARDED_BY(::cs_main); + node::BlockManager m_blockman; /** * In order to efficiently track invalidity of headers, we keep the set of diff --git a/test/functional/feature_init.py b/test/functional/feature_init.py index 16815c1afc..4b56b0c26b 100755 --- a/test/functional/feature_init.py +++ b/test/functional/feature_init.py @@ -93,7 +93,7 @@ class InitStressTest(BitcoinTestFramework): additional_lines = random.randint(1, num_total_logs) self.log.debug(f"Starting node and will exit after {additional_lines} lines") node.start(extra_args=['-txindex=1']) - logfile = open(node.debug_log_path, 'r', encoding='utf8') + logfile = open(node.debug_log_path, 'rb') MAX_SECS_TO_WAIT = 10 start = time.time() |