Merge #16554: test: only include and use OpenSSL where it's actually needed (BIP70)
2f37163caf
test: only include and init openSSL where it's actually used (fanquake) Pull request description: This should save initializing OpenSSL during tests if compiled with `--disable-bip70`. ACKs for top commit: laanwj: straightforward ACK2f37163caf
Tree-SHA512: 513e867718c79b014b4d470404c891d83c21df92eed07abaccd89b88a32f8b801e402e7d0d400c49c1b964f4b76409ca17fb90bde2e2c45dcf8a1897b452683f
This commit is contained in:
commit
e5fdda68c6
2 changed files with 2 additions and 4 deletions
|
@ -16,6 +16,7 @@
|
|||
#include <test/setup_common.h>
|
||||
#include <util/strencodings.h>
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/x509.h>
|
||||
#include <openssl/x509_vfy.h>
|
||||
|
||||
|
@ -66,6 +67,7 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsig
|
|||
|
||||
void PaymentServerTests::paymentServerTests()
|
||||
{
|
||||
SSL_library_init();
|
||||
BasicTestingSetup testing_setup(CBaseChainParams::MAIN);
|
||||
auto node = interfaces::MakeNode();
|
||||
OptionsModel optionsModel(*node);
|
||||
|
|
|
@ -26,8 +26,6 @@
|
|||
#include <QObject>
|
||||
#include <QTest>
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
#if defined(QT_STATICPLUGIN)
|
||||
#include <QtPlugin>
|
||||
#if defined(QT_QPA_PLATFORM_MINIMAL)
|
||||
|
@ -73,8 +71,6 @@ int main(int argc, char *argv[])
|
|||
BitcoinApplication app(*node, argc, argv);
|
||||
app.setApplicationName("Bitcoin-Qt-test");
|
||||
|
||||
SSL_library_init();
|
||||
|
||||
AppTests app_tests(app);
|
||||
if (QTest::qExec(&app_tests) != 0) {
|
||||
fInvalid = true;
|
||||
|
|
Loading…
Reference in a new issue