mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge caff95a023 into merged_master (Bitcoin PR bitcoin/bitcoin#27896)
This commit is contained in:
commit
e999ab6070
28 changed files with 5 additions and 1177 deletions
|
|
@ -20,7 +20,6 @@
|
|||
#include <undo.h>
|
||||
#include <util/batchpriority.h>
|
||||
#include <util/fs.h>
|
||||
#include <util/syscall_sandbox.h>
|
||||
#include <validation.h>
|
||||
|
||||
#include <map>
|
||||
|
|
@ -882,7 +881,6 @@ public:
|
|||
|
||||
void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImportFiles, const fs::path& mempool_path)
|
||||
{
|
||||
SetSyscallSandboxPolicy(SyscallSandboxPolicy::INITIALIZATION_LOAD_BLOCKS);
|
||||
ScheduleBatchPriority();
|
||||
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue