update wallet tests II

This commit is contained in:
Michel van Kessel
2020-12-20 16:51:25 +01:00
parent 00e1b71272
commit d1faa598ff
6 changed files with 25 additions and 26 deletions

View File

@@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "random.h"
#include "utilstrencodings.h"
#include "test/test_bitcoin.h"
#include "wallet/crypter.h"
#include <random.h>
#include <utilstrencodings.h>
#include <test/test_bitcoin.h>
#include <wallet/crypter.h>
#include <vector>

View File

@@ -2,15 +2,15 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpc/server.h"
#include "rpc/client.h"
#include <rpc/server.h>
#include <rpc/client.h>
#include "base58.h"
#include "dstencode.h"
#include "main.h"
#include "wallet/wallet.h"
#include <base58.h>
#include <dstencode.h>
#include <main.h>
#include <wallet/wallet.h>
#include "wallet/test/wallet_test_fixture.h"
#include <wallet/test/wallet_test_fixture.h>
#include <boost/algorithm/string.hpp>
#include <boost/test/unit_test.hpp>
@@ -19,7 +19,7 @@
using namespace std;
extern UniValue createArgs(int nRequired, const char* address1 = NULL, const char* address2 = NULL);
extern UniValue createArgs(int nRequired, const char* address1 = nullptr, const char* address2 = nullptr);
extern UniValue CallRPC(string args);
extern CWallet* pwalletMain;

View File

@@ -2,11 +2,11 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "wallet/test/wallet_test_fixture.h"
#include <wallet/test/wallet_test_fixture.h>
#include "rpc/server.h"
#include "wallet/db.h"
#include "wallet/wallet.h"
#include <rpc/server.h>
#include <wallet/db.h>
#include <wallet/wallet.h>
WalletTestingSetup::WalletTestingSetup(const std::string& chainName):
TestingSetup(chainName)
@@ -25,7 +25,7 @@ WalletTestingSetup::~WalletTestingSetup()
{
UnregisterValidationInterface(pwalletMain);
delete pwalletMain;
pwalletMain = NULL;
pwalletMain = nullptr;
bitdb.Flush(true);
bitdb.Reset();

View File

@@ -5,7 +5,7 @@
#ifndef BITCOIN_WALLET_TEST_FIXTURE_H
#define BITCOIN_WALLET_TEST_FIXTURE_H
#include "test/test_bitcoin.h"
#include <test/test_bitcoin.h>
/** Testing setup and teardown for wallet.
*/

View File

@@ -2,16 +2,15 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "wallet/wallet.h"
#include <wallet/wallet.h>
#include <set>
#include <stdint.h>
#include <utility>
#include <vector>
#include "wallet/test/wallet_test_fixture.h"
#include <wallet/test/wallet_test_fixture.h>
#include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp>
// how many times to run all the tests to have a chance to catch errors that only show up with particular random shuffles

View File

@@ -2,12 +2,12 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "test/test_bitcoin.h"
#include "random.h"
#include "fs.h"
#include <test/test_bitcoin.h>
#include <random.h>
#include <fs.h>
#include "wallet/wallet.h"
#include "wallet/walletdb.h"
#include <wallet/wallet.h>
#include <wallet/walletdb.h>
#include <boost/test/unit_test.hpp>