mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-02-15 18:08:57 +00:00
98bc27fb59
be8ab7d08 Create new wallet databases as directories rather than files (Russell Yanofsky)
26c06f24e Allow wallet files not in -walletdir directory (Russell Yanofsky)
d8a99f65e Allow wallet files in multiple directories (Russell Yanofsky)
Pull request description:
This change consists of three commits:
* The first commit is a pure refactoring that removes the restriction that two wallets can only be opened at the same time if they are contained in the same directory.
* The second commit removes the restriction that `-wallet` filenames can only refer to files in the `-walletdir` directory.
* The third commit makes second commit a little safer by changing bitcoin to create wallet databases as directories rather than files, so they can be safely backed up.
All three commits should be straightforward:
* The first commit adds around 20 lines of new code and then updates a bunch of function signatures (generally updating them to take plain fs::path parameters, instead of combinations of strings, fs::paths, and objects like CDBEnv and CWalletDBWrapper).
* The second commit removes two `-wallet` filename checks and adds some test cases to the multiwallet unit test.
* The third commit just changes the mapping from specified wallet paths to bdb environment & data paths.
---
**Note:** For anybody looking at this PR for the first time, I think you can skip the comments before _20 Nov_ and start reading at https://github.com/bitcoin/bitcoin/pull/11687#issuecomment-345625565. Comments before _20 Nov_ were about an earlier version of the PR that didn't include the third commit, and then confusion from not seeing the first commit.
Tree-SHA512: 00bbb120fe0df847cf57014f75f1f7f1f58b0b62fa0b3adab4560163ebdfe06ccdfff33b4231693f03c5dc23601cb41954a07bcea9a4919c8d42f7d62bcf6024
137 lines
4.0 KiB
C++
137 lines
4.0 KiB
C++
// Copyright (c) 2012-2017 The Bitcoin Core developers
|
|
// 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/test/wallet_test_fixture.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <boost/test/unit_test.hpp>
|
|
|
|
BOOST_FIXTURE_TEST_SUITE(accounting_tests, WalletTestingSetup)
|
|
|
|
static void
|
|
GetResults(CWallet& wallet, std::map<CAmount, CAccountingEntry>& results)
|
|
{
|
|
std::list<CAccountingEntry> aes;
|
|
|
|
results.clear();
|
|
BOOST_CHECK(wallet.ReorderTransactions() == DB_LOAD_OK);
|
|
wallet.ListAccountCreditDebit("", aes);
|
|
for (CAccountingEntry& ae : aes)
|
|
{
|
|
results[ae.nOrderPos] = ae;
|
|
}
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(acc_orderupgrade)
|
|
{
|
|
std::vector<CWalletTx*> vpwtx;
|
|
CWalletTx wtx;
|
|
CAccountingEntry ae;
|
|
std::map<CAmount, CAccountingEntry> results;
|
|
|
|
LOCK(m_wallet.cs_wallet);
|
|
|
|
ae.strAccount = "";
|
|
ae.nCreditDebit = 1;
|
|
ae.nTime = 1333333333;
|
|
ae.strOtherAccount = "b";
|
|
ae.strComment = "";
|
|
m_wallet.AddAccountingEntry(ae);
|
|
|
|
wtx.mapValue["comment"] = "z";
|
|
m_wallet.AddToWallet(wtx);
|
|
vpwtx.push_back(&m_wallet.mapWallet[wtx.GetHash()]);
|
|
vpwtx[0]->nTimeReceived = (unsigned int)1333333335;
|
|
vpwtx[0]->nOrderPos = -1;
|
|
|
|
ae.nTime = 1333333336;
|
|
ae.strOtherAccount = "c";
|
|
m_wallet.AddAccountingEntry(ae);
|
|
|
|
GetResults(m_wallet, results);
|
|
|
|
BOOST_CHECK(m_wallet.nOrderPosNext == 3);
|
|
BOOST_CHECK(2 == results.size());
|
|
BOOST_CHECK(results[0].nTime == 1333333333);
|
|
BOOST_CHECK(results[0].strComment.empty());
|
|
BOOST_CHECK(1 == vpwtx[0]->nOrderPos);
|
|
BOOST_CHECK(results[2].nTime == 1333333336);
|
|
BOOST_CHECK(results[2].strOtherAccount == "c");
|
|
|
|
|
|
ae.nTime = 1333333330;
|
|
ae.strOtherAccount = "d";
|
|
ae.nOrderPos = m_wallet.IncOrderPosNext();
|
|
m_wallet.AddAccountingEntry(ae);
|
|
|
|
GetResults(m_wallet, results);
|
|
|
|
BOOST_CHECK(results.size() == 3);
|
|
BOOST_CHECK(m_wallet.nOrderPosNext == 4);
|
|
BOOST_CHECK(results[0].nTime == 1333333333);
|
|
BOOST_CHECK(1 == vpwtx[0]->nOrderPos);
|
|
BOOST_CHECK(results[2].nTime == 1333333336);
|
|
BOOST_CHECK(results[3].nTime == 1333333330);
|
|
BOOST_CHECK(results[3].strComment.empty());
|
|
|
|
|
|
wtx.mapValue["comment"] = "y";
|
|
{
|
|
CMutableTransaction tx(*wtx.tx);
|
|
++tx.nLockTime; // Just to change the hash :)
|
|
wtx.SetTx(MakeTransactionRef(std::move(tx)));
|
|
}
|
|
m_wallet.AddToWallet(wtx);
|
|
vpwtx.push_back(&m_wallet.mapWallet[wtx.GetHash()]);
|
|
vpwtx[1]->nTimeReceived = (unsigned int)1333333336;
|
|
|
|
wtx.mapValue["comment"] = "x";
|
|
{
|
|
CMutableTransaction tx(*wtx.tx);
|
|
++tx.nLockTime; // Just to change the hash :)
|
|
wtx.SetTx(MakeTransactionRef(std::move(tx)));
|
|
}
|
|
m_wallet.AddToWallet(wtx);
|
|
vpwtx.push_back(&m_wallet.mapWallet[wtx.GetHash()]);
|
|
vpwtx[2]->nTimeReceived = (unsigned int)1333333329;
|
|
vpwtx[2]->nOrderPos = -1;
|
|
|
|
GetResults(m_wallet, results);
|
|
|
|
BOOST_CHECK(results.size() == 3);
|
|
BOOST_CHECK(m_wallet.nOrderPosNext == 6);
|
|
BOOST_CHECK(0 == vpwtx[2]->nOrderPos);
|
|
BOOST_CHECK(results[1].nTime == 1333333333);
|
|
BOOST_CHECK(2 == vpwtx[0]->nOrderPos);
|
|
BOOST_CHECK(results[3].nTime == 1333333336);
|
|
BOOST_CHECK(results[4].nTime == 1333333330);
|
|
BOOST_CHECK(results[4].strComment.empty());
|
|
BOOST_CHECK(5 == vpwtx[1]->nOrderPos);
|
|
|
|
|
|
ae.nTime = 1333333334;
|
|
ae.strOtherAccount = "e";
|
|
ae.nOrderPos = -1;
|
|
m_wallet.AddAccountingEntry(ae);
|
|
|
|
GetResults(m_wallet, results);
|
|
|
|
BOOST_CHECK(results.size() == 4);
|
|
BOOST_CHECK(m_wallet.nOrderPosNext == 7);
|
|
BOOST_CHECK(0 == vpwtx[2]->nOrderPos);
|
|
BOOST_CHECK(results[1].nTime == 1333333333);
|
|
BOOST_CHECK(2 == vpwtx[0]->nOrderPos);
|
|
BOOST_CHECK(results[3].nTime == 1333333336);
|
|
BOOST_CHECK(results[3].strComment.empty());
|
|
BOOST_CHECK(results[4].nTime == 1333333330);
|
|
BOOST_CHECK(results[4].strComment.empty());
|
|
BOOST_CHECK(results[5].nTime == 1333333334);
|
|
BOOST_CHECK(6 == vpwtx[1]->nOrderPos);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_SUITE_END()
|