Update tests for account deprecation
This commit is contained in:
parent
3c31eb24d3
commit
b6f100cf86
|
@ -34,6 +34,12 @@ Value CallRPC(string args)
|
||||||
boost::split(vArgs, args, boost::is_any_of(" \t"));
|
boost::split(vArgs, args, boost::is_any_of(" \t"));
|
||||||
string strMethod = vArgs[0];
|
string strMethod = vArgs[0];
|
||||||
vArgs.erase(vArgs.begin());
|
vArgs.erase(vArgs.begin());
|
||||||
|
// Handle empty strings the same way as CLI
|
||||||
|
for (auto i = 0; i < vArgs.size(); i++) {
|
||||||
|
if (vArgs[i] == "\"\"") {
|
||||||
|
vArgs[i] = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
Array params = RPCConvertValues(strMethod, vArgs);
|
Array params = RPCConvertValues(strMethod, vArgs);
|
||||||
|
|
||||||
rpcfn_type method = tableRPC[strMethod]->actor;
|
rpcfn_type method = tableRPC[strMethod]->actor;
|
||||||
|
|
|
@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
|
||||||
CPubKey demoPubkey = pwalletMain->GenerateNewKey();
|
CPubKey demoPubkey = pwalletMain->GenerateNewKey();
|
||||||
CBitcoinAddress demoAddress = CBitcoinAddress(CTxDestination(demoPubkey.GetID()));
|
CBitcoinAddress demoAddress = CBitcoinAddress(CTxDestination(demoPubkey.GetID()));
|
||||||
Value retValue;
|
Value retValue;
|
||||||
string strAccount = "walletDemoAccount";
|
string strAccount = "";
|
||||||
string strPurpose = "receive";
|
string strPurpose = "receive";
|
||||||
BOOST_CHECK_NO_THROW({ /*Initialize Wallet with an account */
|
BOOST_CHECK_NO_THROW({ /*Initialize Wallet with an account */
|
||||||
CWalletDB walletdb(pwalletMain->strWalletFile);
|
CWalletDB walletdb(pwalletMain->strWalletFile);
|
||||||
|
@ -109,7 +109,9 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
|
||||||
/*********************************
|
/*********************************
|
||||||
* setaccount
|
* setaccount
|
||||||
*********************************/
|
*********************************/
|
||||||
BOOST_CHECK_NO_THROW(CallRPC("setaccount " + setaccountDemoAddress.ToString() + " nullaccount"));
|
BOOST_CHECK_NO_THROW(CallRPC("setaccount " + setaccountDemoAddress.ToString() + " \"\""));
|
||||||
|
/* Accounts are disabled */
|
||||||
|
BOOST_CHECK_THROW(CallRPC("setaccount " + setaccountDemoAddress.ToString() + " nullaccount"), runtime_error);
|
||||||
/* t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1GpgV is not owned by the test wallet. */
|
/* t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1GpgV is not owned by the test wallet. */
|
||||||
BOOST_CHECK_THROW(CallRPC("setaccount t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1GpgV nullaccount"), runtime_error);
|
BOOST_CHECK_THROW(CallRPC("setaccount t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1GpgV nullaccount"), runtime_error);
|
||||||
BOOST_CHECK_THROW(CallRPC("setaccount"), runtime_error);
|
BOOST_CHECK_THROW(CallRPC("setaccount"), runtime_error);
|
||||||
|
@ -121,7 +123,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
|
||||||
* getbalance
|
* getbalance
|
||||||
*********************************/
|
*********************************/
|
||||||
BOOST_CHECK_NO_THROW(CallRPC("getbalance"));
|
BOOST_CHECK_NO_THROW(CallRPC("getbalance"));
|
||||||
BOOST_CHECK_NO_THROW(CallRPC("getbalance " + demoAddress.ToString()));
|
BOOST_CHECK_THROW(CallRPC("getbalance " + demoAddress.ToString()), runtime_error);
|
||||||
|
|
||||||
/*********************************
|
/*********************************
|
||||||
* listunspent
|
* listunspent
|
||||||
|
@ -192,13 +194,16 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
|
||||||
* getnewaddress
|
* getnewaddress
|
||||||
*********************************/
|
*********************************/
|
||||||
BOOST_CHECK_NO_THROW(CallRPC("getnewaddress"));
|
BOOST_CHECK_NO_THROW(CallRPC("getnewaddress"));
|
||||||
BOOST_CHECK_NO_THROW(CallRPC("getnewaddress getnewaddress_demoaccount"));
|
BOOST_CHECK_NO_THROW(CallRPC("getnewaddress \"\""));
|
||||||
|
/* Accounts are deprecated */
|
||||||
|
BOOST_CHECK_THROW(CallRPC("getnewaddress getnewaddress_demoaccount"), runtime_error);
|
||||||
|
|
||||||
/*********************************
|
/*********************************
|
||||||
* getaccountaddress
|
* getaccountaddress
|
||||||
*********************************/
|
*********************************/
|
||||||
BOOST_CHECK_NO_THROW(CallRPC("getaccountaddress \"\""));
|
BOOST_CHECK_NO_THROW(CallRPC("getaccountaddress \"\""));
|
||||||
BOOST_CHECK_NO_THROW(CallRPC("getaccountaddress accountThatDoesntExists")); // Should generate a new account
|
/* Accounts are deprecated */
|
||||||
|
BOOST_CHECK_THROW(CallRPC("getaccountaddress accountThatDoesntExists"), runtime_error);
|
||||||
BOOST_CHECK_NO_THROW(retValue = CallRPC("getaccountaddress " + strAccount));
|
BOOST_CHECK_NO_THROW(retValue = CallRPC("getaccountaddress " + strAccount));
|
||||||
BOOST_CHECK(CBitcoinAddress(retValue.get_str()).Get() == demoAddress.Get());
|
BOOST_CHECK(CBitcoinAddress(retValue.get_str()).Get() == demoAddress.Get());
|
||||||
|
|
||||||
|
@ -234,8 +239,12 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
|
||||||
BOOST_CHECK_THROW(CallRPC("getaddressesbyaccount"), runtime_error);
|
BOOST_CHECK_THROW(CallRPC("getaddressesbyaccount"), runtime_error);
|
||||||
BOOST_CHECK_NO_THROW(retValue = CallRPC("getaddressesbyaccount " + strAccount));
|
BOOST_CHECK_NO_THROW(retValue = CallRPC("getaddressesbyaccount " + strAccount));
|
||||||
Array arr = retValue.get_array();
|
Array arr = retValue.get_array();
|
||||||
BOOST_CHECK(arr.size() > 0);
|
BOOST_CHECK_EQUAL(4, arr.size());
|
||||||
BOOST_CHECK(CBitcoinAddress(arr[0].get_str()).Get() == demoAddress.Get());
|
bool notFound = true;
|
||||||
|
for (auto a : arr) {
|
||||||
|
notFound &= CBitcoinAddress(a.get_str()).Get() != demoAddress.Get();
|
||||||
|
}
|
||||||
|
BOOST_CHECK(!notFound);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* getblocksubsidy
|
* getblocksubsidy
|
||||||
|
|
Loading…
Reference in New Issue