From 9a5a5a3d08b2c130ab9147914739ff3583b0dc84 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 21 Sep 2021 14:09:23 -0400 Subject: [PATCH] test/setup: Use LoadChainstate This commit coalesces the chainstate loading sequence between our unit test and non-unit test init codepaths. --- src/test/util/setup_common.cpp | 28 ++++++++++++++++++---------- src/test/util/setup_common.h | 2 ++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index f5cc88f4ce..628cedac19 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -17,6 +17,8 @@ #include #include #include +#include // for fReindex, fPruneMode +#include // for LoadChainstate #include #include #include @@ -24,6 +26,7 @@ #include #include #include