diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/forms/receivecoinsdialog.ui | 8 | ||||
| -rw-r--r-- | src/qt/forms/sendcoinsentry.ui | 3 | ||||
| -rw-r--r-- | src/test/accounting_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/rpc_wallet_tests.cpp | 7 | ||||
| -rw-r--r-- | src/test/wallet_tests.cpp | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index 7bf01224ee..e93636ea5f 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -46,21 +46,21 @@ <item row="4" column="2"> <widget class="QLineEdit" name="reqLabel"> <property name="toolTip"> - <string>The label to associate with the new receiving address</string> + <string>An optional label to associate with the new receiving address</string> </property> </widget> </item> <item row="6" column="2"> <widget class="QLineEdit" name="reqMessage"> <property name="toolTip"> - <string>The message to attach to payment request</string> + <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string> </property> </widget> </item> <item row="2" column="2"> <widget class="QLabel" name="label_5"> <property name="text"> - <string>Use this form to request payments. All fields are optional.</string> + <string>Use this form to request payments. All fields are <b>optional</b>.</string> </property> </widget> </item> @@ -99,7 +99,7 @@ </size> </property> <property name="toolTip"> - <string>The amount to request</string> + <string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string> </property> </widget> </item> diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 96c922af4d..76039ce52a 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -153,6 +153,9 @@ </item> <item row="3" column="1"> <widget class="QLabel" name="messageTextLabel"> + <property name="toolTip"> + <string>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</string> + </property> <property name="textFormat"> <enum>Qt::PlainText</enum> </property> diff --git a/src/test/accounting_tests.cpp b/src/test/accounting_tests.cpp index 5f79436e48..bfdb95927b 100644 --- a/src/test/accounting_tests.cpp +++ b/src/test/accounting_tests.cpp @@ -34,6 +34,8 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade) CAccountingEntry ae; std::map<int64_t, CAccountingEntry> results; + LOCK(pwalletMain->cs_wallet); + ae.strAccount = ""; ae.nCreditDebit = 1; ae.nTime = 1333333333; diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index 2cf0fb350b..628ba95067 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -2,6 +2,7 @@ #include "rpcclient.h" #include "base58.h" +#include "wallet.h" #include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> @@ -12,10 +13,14 @@ using namespace json_spirit; extern Array createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL); extern Value CallRPC(string args); +extern CWallet* pwalletMain; + BOOST_AUTO_TEST_SUITE(rpc_wallet_tests) BOOST_AUTO_TEST_CASE(rpc_addmultisig) { + LOCK(pwalletMain->cs_wallet); + rpcfn_type addmultisig = tableRPC["addmultisigaddress"]->actor; // old, 65-byte-long: @@ -56,6 +61,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet) // Test RPC calls for various wallet statistics Value r; + LOCK(pwalletMain->cs_wallet); + BOOST_CHECK_NO_THROW(CallRPC("listunspent")); BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error); BOOST_CHECK_THROW(CallRPC("listunspent 0 string"), runtime_error); diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp index 0acd94ef36..bd0517ae08 100644 --- a/src/test/wallet_tests.cpp +++ b/src/test/wallet_tests.cpp @@ -62,6 +62,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) CoinSet setCoinsRet, setCoinsRet2; int64_t nValueRet; + LOCK(wallet.cs_wallet); + // test multiple times to allow for differences in the shuffle order for (int i = 0; i < RUN_TESTS; i++) { |