From ef8ca179ef007eba5bed497be18f5bc90a4194a6 Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Fri, 28 Apr 2017 13:59:25 -0400 Subject: [test] Add tests for some walletmodel functions Add unit tests for some walletmodel functions that will be refactored & moved in the next commit. --- src/qt/test/wallettests.cpp | 127 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 2 deletions(-) (limited to 'src/qt') diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index a0dce3d997..867711309e 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -1,5 +1,6 @@ #include "wallettests.h" +#include "consensus/validation.h" #include "qt/bitcoinamountfield.h" #include "qt/callback.h" #include "qt/optionsmodel.h" @@ -11,6 +12,8 @@ #include "qt/walletmodel.h" #include "test/test_bitcoin.h" #include "validation.h" +#include "wallet/test/wallet_test_fixture.h" +#include "wallet/coincontrol.h" #include "wallet/wallet.h" #include @@ -20,6 +23,118 @@ namespace { + +void TestLoadReceiveRequests() +{ + WalletTestingSetup test; + OptionsModel optionsModel; + WalletModel walletModel(nullptr, pwalletMain, &optionsModel); + + CTxDestination dest = CKeyID(); + pwalletMain->AddDestData(dest, "misc", "val_misc"); + pwalletMain->AddDestData(dest, "rr0", "val_rr0"); + pwalletMain->AddDestData(dest, "rr1", "val_rr1"); + + std::vector values; + walletModel.loadReceiveRequests(values); + QCOMPARE((int)values.size(), 2); + QCOMPARE(QString::fromStdString(values[0]), QString("val_rr0")); + QCOMPARE(QString::fromStdString(values[1]), QString("val_rr1")); +} + +class ListCoinsTestingSetup : public TestChain100Setup +{ +public: + ListCoinsTestingSetup() + { + CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())); + ::bitdb.MakeMock(); + wallet.reset(new CWallet(std::unique_ptr(new CWalletDBWrapper(&bitdb, "wallet_test.dat")))); + bool firstRun; + wallet->LoadWallet(firstRun); + LOCK(wallet->cs_wallet); + wallet->AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey()); + wallet->ScanForWalletTransactions(chainActive.Genesis()); + } + + ~ListCoinsTestingSetup() + { + ::bitdb.Flush(true); + ::bitdb.Reset(); + } + + CWalletTx& AddTx(CRecipient recipient) + { + CWalletTx wtx; + CReserveKey reservekey(wallet.get()); + CAmount fee; + int changePos = -1; + std::string error; + wallet->CreateTransaction({recipient}, wtx, reservekey, fee, changePos, error); + CValidationState state; + wallet->CommitTransaction(wtx, reservekey, nullptr, state); + auto it = wallet->mapWallet.find(wtx.GetHash()); + CreateAndProcessBlock({CMutableTransaction(*it->second.tx)}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())); + it->second.SetMerkleBranch(chainActive.Tip(), 1); + return it->second; + } + + std::unique_ptr wallet; +}; + +void TestListCoins() +{ + ListCoinsTestingSetup test; + OptionsModel optionsModel; + WalletModel walletModel(nullptr, test.wallet.get(), &optionsModel); + QString coinbaseAddress = QString::fromStdString(CBitcoinAddress(test.coinbaseKey.GetPubKey().GetID()).ToString()); + + LOCK(test.wallet->cs_wallet); + + // Confirm ListCoins initially returns 1 coin grouped under coinbaseKey + // address. + std::map> list; + walletModel.listCoins(list); + QCOMPARE((int)list.size(), 1); + QCOMPARE(list.begin()->first, coinbaseAddress); + QCOMPARE((int)list.begin()->second.size(), 1); + + // Check initial balance from one mature coinbase transaction. + CCoinControl coinControl; + QCOMPARE(50 * COIN, walletModel.getBalance(&coinControl)); + + // Add a transaction creating a change address, and confirm ListCoins still + // returns the coin associated with the change address underneath the + // coinbaseKey pubkey, even though the change address has a different + // pubkey. + test.AddTx(CRecipient{GetScriptForRawPubKey({}), 1 * COIN, false /* subtract fee */}); + list.clear(); + walletModel.listCoins(list); + QCOMPARE((int)list.size(), 1); + QCOMPARE(list.begin()->first, coinbaseAddress); + QCOMPARE((int)list.begin()->second.size(), 2); + + // Lock both coins. Confirm number of available coins drops to 0. + std::vector available; + test.wallet->AvailableCoins(available); + QCOMPARE((int)available.size(), 2); + for (const auto& group : list) { + for (const auto& coin : group.second) { + test.wallet->LockCoin(COutPoint(coin.tx->GetHash(), coin.i)); + } + } + test.wallet->AvailableCoins(available); + QCOMPARE((int)available.size(), 0); + + // Confirm ListCoins still returns same result as before, despite coins + // being locked. + list.clear(); + walletModel.listCoins(list); + QCOMPARE((int)list.size(), 1); + QCOMPARE(list.begin()->first, coinbaseAddress); + QCOMPARE((int)list.begin()->second.size(), 2); +} + //! Press "Yes" button in modal send confirmation dialog. void ConfirmSend() { @@ -65,7 +180,6 @@ QModelIndex FindTx(const QAbstractItemModel& model, const uint256& txid) } return {}; } -} //! Simple qt wallet tests. // @@ -80,7 +194,7 @@ QModelIndex FindTx(const QAbstractItemModel& model, const uint256& txid) // src/qt/test/test_bitcoin-qt -platform xcb # Linux // src/qt/test/test_bitcoin-qt -platform windows # Windows // src/qt/test/test_bitcoin-qt -platform cocoa # macOS -void WalletTests::walletTests() +void TestSendCoins() { // Set up wallet and chain with 101 blocks (1 mature block for spending). TestChain100Setup test; @@ -117,3 +231,12 @@ void WalletTests::walletTests() bitdb.Flush(true); bitdb.Reset(); } + +} + +void WalletTests::walletTests() +{ + TestLoadReceiveRequests(); + TestListCoins(); + TestSendCoins(); +} -- cgit v1.2.3 From d944bd7a27abe0fa74d40ba5e90f345f51bb5141 Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Fri, 28 Apr 2017 14:10:21 -0400 Subject: [qt] Move some WalletModel functions into CWallet Motivation for moving these is to make supporting IPC simpler (#10102), so these lookups can be one-shot IPC requests, instead of back-and-forth interactions over the IPC channel. Also these functions are potentially useful outside of the bitcoin GUI (e.g. for RPCs). --- src/qt/walletmodel.cpp | 56 +++++++------------------------------------------- 1 file changed, 7 insertions(+), 49 deletions(-) (limited to 'src/qt') diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index a2a9271904..719089d05a 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -63,14 +63,7 @@ CAmount WalletModel::getBalance(const CCoinControl *coinControl) const { if (coinControl) { - CAmount nBalance = 0; - std::vector vCoins; - wallet->AvailableCoins(vCoins, true, coinControl); - BOOST_FOREACH(const COutput& out, vCoins) - if(out.fSpendable) - nBalance += out.tx->tx->vout[out.i].nValue; - - return nBalance; + return wallet->GetAvailableBalance(coinControl); } return wallet->GetBalance(); @@ -595,38 +588,11 @@ bool WalletModel::isSpent(const COutPoint& outpoint) const // AvailableCoins + LockedCoins grouped by wallet address (put change in one group with wallet address) void WalletModel::listCoins(std::map >& mapCoins) const { - std::vector vCoins; - wallet->AvailableCoins(vCoins); - - LOCK2(cs_main, wallet->cs_wallet); // ListLockedCoins, mapWallet - std::vector vLockedCoins; - wallet->ListLockedCoins(vLockedCoins); - - // add locked coins - BOOST_FOREACH(const COutPoint& outpoint, vLockedCoins) - { - if (!wallet->mapWallet.count(outpoint.hash)) continue; - int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain(); - if (nDepth < 0) continue; - COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true /* spendable */, true /* solvable */, true /* safe */); - if (outpoint.n < out.tx->tx->vout.size() && wallet->IsMine(out.tx->tx->vout[outpoint.n]) == ISMINE_SPENDABLE) - vCoins.push_back(out); - } - - BOOST_FOREACH(const COutput& out, vCoins) - { - COutput cout = out; - - while (wallet->IsChange(cout.tx->tx->vout[cout.i]) && cout.tx->tx->vin.size() > 0 && wallet->IsMine(cout.tx->tx->vin[0])) - { - if (!wallet->mapWallet.count(cout.tx->tx->vin[0].prevout.hash)) break; - cout = COutput(&wallet->mapWallet[cout.tx->tx->vin[0].prevout.hash], cout.tx->tx->vin[0].prevout.n, 0 /* depth */, true /* spendable */, true /* solvable */, true /* safe */); + for (auto& group : wallet->ListCoins()) { + auto& resultGroup = mapCoins[QString::fromStdString(CBitcoinAddress(group.first).ToString())]; + for (auto& coin : group.second) { + resultGroup.emplace_back(std::move(coin)); } - - CTxDestination address; - if(!out.fSpendable || !ExtractDestination(cout.tx->tx->vout[cout.i].scriptPubKey, address)) - continue; - mapCoins[QString::fromStdString(CBitcoinAddress(address).ToString())].push_back(out); } } @@ -656,11 +622,7 @@ void WalletModel::listLockedCoins(std::vector& vOutpts) void WalletModel::loadReceiveRequests(std::vector& vReceiveRequests) { - LOCK(wallet->cs_wallet); - BOOST_FOREACH(const PAIRTYPE(CTxDestination, CAddressBookData)& item, wallet->mapAddressBook) - BOOST_FOREACH(const PAIRTYPE(std::string, std::string)& item2, item.second.destdata) - if (item2.first.size() > 2 && item2.first.substr(0,2) == "rr") // receive request - vReceiveRequests.push_back(item2.second); + vReceiveRequests = wallet->GetDestValues("rr"); // receive request } bool WalletModel::saveReceiveRequest(const std::string &sAddress, const int64_t nId, const std::string &sRequest) @@ -680,11 +642,7 @@ bool WalletModel::saveReceiveRequest(const std::string &sAddress, const int64_t bool WalletModel::transactionCanBeAbandoned(uint256 hash) const { - LOCK2(cs_main, wallet->cs_wallet); - const CWalletTx *wtx = wallet->GetWalletTx(hash); - if (!wtx || wtx->isAbandoned() || wtx->GetDepthInMainChain() > 0 || wtx->InMempool()) - return false; - return true; + return wallet->TransactionCanBeAbandoned(hash); } bool WalletModel::abandonTransaction(uint256 hash) const -- cgit v1.2.3 From 429aa9eb519b72a79f8bb41d0c4d7d47bcd9dd0d Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Fri, 28 Apr 2017 14:18:14 -0400 Subject: [test] Move some tests from qt -> wallet After previous refactoring, the tests make more sense here. --- src/qt/test/wallettests.cpp | 117 -------------------------------------------- 1 file changed, 117 deletions(-) (limited to 'src/qt') diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index 867711309e..798d333d63 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -1,6 +1,5 @@ #include "wallettests.h" -#include "consensus/validation.h" #include "qt/bitcoinamountfield.h" #include "qt/callback.h" #include "qt/optionsmodel.h" @@ -12,8 +11,6 @@ #include "qt/walletmodel.h" #include "test/test_bitcoin.h" #include "validation.h" -#include "wallet/test/wallet_test_fixture.h" -#include "wallet/coincontrol.h" #include "wallet/wallet.h" #include @@ -23,118 +20,6 @@ namespace { - -void TestLoadReceiveRequests() -{ - WalletTestingSetup test; - OptionsModel optionsModel; - WalletModel walletModel(nullptr, pwalletMain, &optionsModel); - - CTxDestination dest = CKeyID(); - pwalletMain->AddDestData(dest, "misc", "val_misc"); - pwalletMain->AddDestData(dest, "rr0", "val_rr0"); - pwalletMain->AddDestData(dest, "rr1", "val_rr1"); - - std::vector values; - walletModel.loadReceiveRequests(values); - QCOMPARE((int)values.size(), 2); - QCOMPARE(QString::fromStdString(values[0]), QString("val_rr0")); - QCOMPARE(QString::fromStdString(values[1]), QString("val_rr1")); -} - -class ListCoinsTestingSetup : public TestChain100Setup -{ -public: - ListCoinsTestingSetup() - { - CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())); - ::bitdb.MakeMock(); - wallet.reset(new CWallet(std::unique_ptr(new CWalletDBWrapper(&bitdb, "wallet_test.dat")))); - bool firstRun; - wallet->LoadWallet(firstRun); - LOCK(wallet->cs_wallet); - wallet->AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey()); - wallet->ScanForWalletTransactions(chainActive.Genesis()); - } - - ~ListCoinsTestingSetup() - { - ::bitdb.Flush(true); - ::bitdb.Reset(); - } - - CWalletTx& AddTx(CRecipient recipient) - { - CWalletTx wtx; - CReserveKey reservekey(wallet.get()); - CAmount fee; - int changePos = -1; - std::string error; - wallet->CreateTransaction({recipient}, wtx, reservekey, fee, changePos, error); - CValidationState state; - wallet->CommitTransaction(wtx, reservekey, nullptr, state); - auto it = wallet->mapWallet.find(wtx.GetHash()); - CreateAndProcessBlock({CMutableTransaction(*it->second.tx)}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())); - it->second.SetMerkleBranch(chainActive.Tip(), 1); - return it->second; - } - - std::unique_ptr wallet; -}; - -void TestListCoins() -{ - ListCoinsTestingSetup test; - OptionsModel optionsModel; - WalletModel walletModel(nullptr, test.wallet.get(), &optionsModel); - QString coinbaseAddress = QString::fromStdString(CBitcoinAddress(test.coinbaseKey.GetPubKey().GetID()).ToString()); - - LOCK(test.wallet->cs_wallet); - - // Confirm ListCoins initially returns 1 coin grouped under coinbaseKey - // address. - std::map> list; - walletModel.listCoins(list); - QCOMPARE((int)list.size(), 1); - QCOMPARE(list.begin()->first, coinbaseAddress); - QCOMPARE((int)list.begin()->second.size(), 1); - - // Check initial balance from one mature coinbase transaction. - CCoinControl coinControl; - QCOMPARE(50 * COIN, walletModel.getBalance(&coinControl)); - - // Add a transaction creating a change address, and confirm ListCoins still - // returns the coin associated with the change address underneath the - // coinbaseKey pubkey, even though the change address has a different - // pubkey. - test.AddTx(CRecipient{GetScriptForRawPubKey({}), 1 * COIN, false /* subtract fee */}); - list.clear(); - walletModel.listCoins(list); - QCOMPARE((int)list.size(), 1); - QCOMPARE(list.begin()->first, coinbaseAddress); - QCOMPARE((int)list.begin()->second.size(), 2); - - // Lock both coins. Confirm number of available coins drops to 0. - std::vector available; - test.wallet->AvailableCoins(available); - QCOMPARE((int)available.size(), 2); - for (const auto& group : list) { - for (const auto& coin : group.second) { - test.wallet->LockCoin(COutPoint(coin.tx->GetHash(), coin.i)); - } - } - test.wallet->AvailableCoins(available); - QCOMPARE((int)available.size(), 0); - - // Confirm ListCoins still returns same result as before, despite coins - // being locked. - list.clear(); - walletModel.listCoins(list); - QCOMPARE((int)list.size(), 1); - QCOMPARE(list.begin()->first, coinbaseAddress); - QCOMPARE((int)list.begin()->second.size(), 2); -} - //! Press "Yes" button in modal send confirmation dialog. void ConfirmSend() { @@ -236,7 +121,5 @@ void TestSendCoins() void WalletTests::walletTests() { - TestLoadReceiveRequests(); - TestListCoins(); TestSendCoins(); } -- cgit v1.2.3