Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Returning entire response from test_response instead of just status code.

Browse source
This commit is contained in:
clemahieu 2017-01-13 17:19:29 -06:00
commit b1c136795d
1 changed files with 67 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

135
rai/core_test/rpc.cpp
View file

@ -8,9 +8,9 @@
#include <boost/property_tree/json_parser.hpp>
#include <boost/thread.hpp>
std::pair <boost::property_tree::ptree, boost::network::http::server <rai::rpc>::response::status_type> test_response (boost::property_tree::ptree const & request_a, rai::rpc & rpc_a, boost::shared_ptr <boost::asio::io_service> service_a)
std::pair <boost::property_tree::ptree, boost::network::http::client::response> test_response (boost::property_tree::ptree const & request_a, rai::rpc & rpc_a, boost::shared_ptr <boost::asio::io_service> service_a)
{
std::pair <boost::property_tree::ptree, boost::network::http::server <rai::rpc>::response::status_type> result;
std::pair <boost::property_tree::ptree, boost::network::http::client::response> result;
boost::network::http::client client (boost::network::http::client::options ().io_service (service_a));
auto url ("http://[::1]:" + std::to_string (rpc_a.config.port));
boost::network::http::client::request request (url);
@ -23,13 +23,12 @@ std::pair <boost::property_tree::ptree, boost::network::http::server <rai::rpc>:
request.add_header (std::make_pair ("content-length", std::to_string (request_string.size ())));
try
{
boost::network::http::client::response response = client.post (request, request_string);
uint16_t status (boost::network::http::status (response));
result.second = static_cast <boost::network::http::server <rai::rpc>::response::status_type> (status);
std::string body_l (boost::network::http::body (response));
if (result.second == boost::network::http::server <rai::rpc>::response::ok)
result.second = client.post (request, request_string);
uint16_t status (boost::network::http::status (result.second));
std::string body_l (boost::network::http::body (result.second));
if (status == boost::network::http::server <rai::rpc>::response::ok)
{
std::stringstream istream (response.body ());
std::stringstream istream (result.second.body ());
boost::property_tree::read_json (istream, result.first);
}
}
@ -50,7 +49,7 @@ TEST (rpc, account_balance)
request.put ("action", "account_balance");
request.put ("account", rai::test_genesis_key.pub.to_account ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string balance_text (response.first.get <std::string> ("balance"));
ASSERT_EQ ("340282366920938463463374607431768211455", balance_text);
rpc.stop ();
@ -68,7 +67,7 @@ TEST (rpc, account_create)
request.put ("action", "account_create");
request.put ("wallet", system.nodes [0]->wallets.items.begin ()->first.to_string ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto account_text (response.first.get <std::string> ("account"));
rai::uint256_union account;
ASSERT_FALSE (account.decode_account (account_text));
@ -93,7 +92,7 @@ TEST (rpc, account_weight)
request.put ("action", "account_weight");
request.put ("account", key.pub.to_account ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string balance_text (response.first.get <std::string> ("weight"));
ASSERT_EQ ("340282366920938463463374607431768211455", balance_text);
rpc.stop();
@ -115,7 +114,7 @@ TEST (rpc, wallet_contains)
request.put ("action", "wallet_contains");
request.put ("account", rai::test_genesis_key.pub.to_account ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string exists_text (response.first.get <std::string> ("exists"));
ASSERT_EQ ("1", exists_text);
rpc.stop();
@ -136,7 +135,7 @@ TEST (rpc, wallet_doesnt_contain)
request.put ("action", "wallet_contains");
request.put ("account", rai::test_genesis_key.pub.to_account ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string exists_text (response.first.get <std::string> ("exists"));
ASSERT_EQ ("0", exists_text);
rpc.stop();
@ -176,7 +175,7 @@ TEST (rpc, validate_account_invalid)
request.put ("action", "validate_account_number");
request.put ("account", account);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string exists_text (response.first.get <std::string> ("valid"));
ASSERT_EQ ("0", exists_text);
rpc.stop();
@ -210,7 +209,7 @@ TEST (rpc, send)
}
});
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string block_text (response.first.get <std::string> ("block"));
rai::block_hash block;
ASSERT_FALSE (block.decode_hex (block_text));
@ -248,7 +247,7 @@ TEST (rpc, send_fail)
});
auto response (test_response (request, rpc, system.service));
done = true;
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string block_text (response.first.get <std::string> ("block"));
rai::block_hash block;
ASSERT_FALSE (block.decode_hex (block_text));
@ -291,7 +290,7 @@ TEST (rpc, wallet_add)
request.put ("action", "wallet_add");
request.put ("key", key_text);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string account_text1 (response.first.get <std::string> ("account"));
ASSERT_EQ (account_text1, key1.pub.to_account ());
rpc.stop();
@ -311,7 +310,7 @@ TEST (rpc, wallet_password_valid)
request.put ("wallet", wallet);
request.put ("action", "password_valid");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string account_text1 (response.first.get <std::string> ("valid"));
ASSERT_EQ (account_text1, "1");
rpc.stop();
@ -332,7 +331,7 @@ TEST (rpc, wallet_password_change)
request.put ("action", "password_change");
request.put ("password", "test");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string account_text1 (response.first.get <std::string> ("changed"));
ASSERT_EQ (account_text1, "1");
ASSERT_TRUE (system.wallet (0)->valid_password ());
@ -368,7 +367,7 @@ TEST (rpc, wallet_password_enter)
request.put ("action", "password_enter");
request.put ("password", "");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string account_text1 (response.first.get <std::string> ("valid"));
ASSERT_EQ (account_text1, "1");
rpc.stop();
@ -388,7 +387,7 @@ TEST (rpc, representative)
request.put ("wallet", wallet);
request.put ("action", "representative");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string account_text1 (response.first.get <std::string> ("representative"));
ASSERT_EQ (account_text1, rai::genesis_account.to_account ());
rpc.stop();
@ -410,7 +409,7 @@ TEST (rpc, representative_set)
request.put ("action", "representative_set");
request.put ("representative", key.pub.to_account ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
rai::transaction transaction (system.nodes [0]->store.environment, nullptr, false);
ASSERT_EQ (key.pub, system.nodes [0]->wallets.items.begin ()->second->store.representative (transaction));
rpc.stop();
@ -433,7 +432,7 @@ TEST (rpc, account_list)
request.put ("wallet", wallet);
request.put ("action", "account_list");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & accounts_node (response.first.get_child ("accounts"));
std::vector <rai::uint256_union> accounts;
for (auto i (accounts_node.begin ()), j (accounts_node.end ()); i != j; ++i)
@ -466,7 +465,7 @@ TEST (rpc, wallet_key_valid)
request.put ("wallet", wallet);
request.put ("action", "wallet_key_valid");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string exists_text (response.first.get <std::string> ("valid"));
ASSERT_EQ ("1", exists_text);
rpc.stop();
@ -483,7 +482,7 @@ TEST (rpc, wallet_create)
boost::property_tree::ptree request;
request.put ("action", "wallet_create");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string wallet_text (response.first.get <std::string> ("wallet"));
rai::uint256_union wallet_id;
ASSERT_FALSE (wallet_id.decode_hex (wallet_text));
@ -504,7 +503,7 @@ TEST (rpc, wallet_export)
request.put ("action", "wallet_export");
request.put ("wallet", system.nodes [0]->wallets.items.begin ()->first.to_string ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string wallet_json (response.first.get <std::string> ("json"));
bool error (false);
rai::transaction transaction (system.nodes [0]->store.environment, nullptr, true);
@ -529,7 +528,7 @@ TEST (rpc, wallet_destroy)
request.put ("action", "wallet_destroy");
request.put ("wallet", wallet_id.to_string ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
ASSERT_EQ (system.nodes [0]->wallets.items.end (), system.nodes [0]->wallets.items.find (wallet_id));
rpc.stop();
thread1.join();
@ -559,7 +558,7 @@ TEST (rpc, account_move)
keys.push_back (std::make_pair ("", entry));
request.add_child ("accounts", keys);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
ASSERT_EQ ("1", response.first.get <std::string> ("moved"));
ASSERT_TRUE (destination->exists (key.pub));
ASSERT_TRUE (destination->exists (rai::test_genesis_key.pub));
@ -580,7 +579,7 @@ TEST (rpc, block)
request.put ("action", "block");
request.put ("hash", system.nodes [0]->latest (rai::genesis_account).to_string ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto contents (response.first.get <std::string> ("contents"));
ASSERT_FALSE (contents.empty ());
rpc.stop();
@ -599,7 +598,7 @@ TEST (rpc, block_account)
request.put ("action", "block_account");
request.put ("hash", genesis.hash ().to_string ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::string account_text (response.first.get <std::string> ("account"));
rai::account account;
ASSERT_FALSE (account.decode_account (account_text));
@ -625,7 +624,7 @@ TEST (rpc, chain)
request.put ("block", block->hash().to_string ());
request.put ("count", std::to_string (std::numeric_limits <uint64_t>::max ()));
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & blocks_node (response.first.get_child ("blocks"));
std::vector <rai::block_hash> blocks;
for (auto i (blocks_node.begin ()), n (blocks_node.end ()); i != n; ++i)
@ -657,7 +656,7 @@ TEST (rpc, chain_limit)
request.put ("block", block->hash().to_string ());
request.put ("count", 1);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & blocks_node (response.first.get_child ("blocks"));
std::vector <rai::block_hash> blocks;
for (auto i (blocks_node.begin ()), n (blocks_node.end ()); i != n; ++i)
@ -693,7 +692,7 @@ TEST (rpc, frontier)
request.put ("account", rai::account (0).to_account ());
request.put ("count", std::to_string (std::numeric_limits <uint64_t>::max ()));
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & frontiers_node (response.first.get_child ("frontiers"));
std::unordered_map <rai::account, rai::block_hash> frontiers;
for (auto i (frontiers_node.begin ()), j (frontiers_node.end ()); i != j; ++i)
@ -733,7 +732,7 @@ TEST (rpc, frontier_limited)
request.put ("account", rai::account (0).to_account ());
request.put ("count", std::to_string (100));
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & frontiers_node (response.first.get_child ("frontiers"));
ASSERT_EQ (100, frontiers_node.size ());
rpc.stop();
@ -763,7 +762,7 @@ TEST (rpc, frontier_startpoint)
request.put ("account", source.begin ()->first.to_account ());
request.put ("count", std::to_string (1));
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & frontiers_node (response.first.get_child ("frontiers"));
ASSERT_EQ (1, frontiers_node.size ());
ASSERT_EQ (source.begin ()->first.to_account (), frontiers_node.begin ()->first);
@ -790,7 +789,7 @@ TEST (rpc, history)
request.put ("hash", receive->hash().to_string ());
request.put ("count", 100);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
std::vector <std::tuple <std::string, std::string, std::string, std::string>> history_l;
auto & history_node (response.first.get_child ("history"));
for (auto i (history_node.begin ()), n (history_node.end ()); i != n; ++i)
@ -834,7 +833,7 @@ TEST (rpc, history_count)
request.put ("hash", receive->hash().to_string ());
request.put ("count", 1);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & history_node (response.first.get_child ("history"));
ASSERT_EQ (1, history_node.size ());
rpc.stop();
@ -858,7 +857,7 @@ TEST (rpc, process_block)
send.serialize_json (json);
request.put ("block", json);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
ASSERT_EQ (send.hash (), system.nodes [0]->latest (rai::test_genesis_key.pub));
rpc.stop();
thread1.join();
@ -882,7 +881,7 @@ TEST (rpc, process_block_no_work)
send.serialize_json (json);
request.put ("block", json);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::bad_request, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::bad_request, static_cast <uint16_t> (boost::network::http::status (response.second)));
rpc.stop();
thread1.join();
}
@ -906,7 +905,7 @@ TEST (rpc, keepalive)
ASSERT_FALSE (system.nodes [0]->peers.known_peer (node1->network.endpoint ()));
ASSERT_EQ (0, system.nodes [0]->peers.size());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto iterations (0);
while (!system.nodes [0]->peers.known_peer (node1->network.endpoint ()))
{
@ -935,7 +934,7 @@ TEST (rpc, payment_init)
request.put ("action", "payment_init");
request.put ("wallet", wallet_id.pub.to_string ());
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
ASSERT_EQ ("Ready", response.first.get <std::string> ("status"));
rpc.stop();
thread1.join();
@ -957,7 +956,7 @@ TEST (rpc, payment_begin_end)
request1.put ("action", "payment_begin");
request1.put ("wallet", wallet_id.pub.to_string ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
auto account_text (response1.first.get <std::string> ("account"));
rai::uint256_union account;
ASSERT_FALSE (account.decode_account (account_text));
@ -979,7 +978,7 @@ TEST (rpc, payment_begin_end)
request2.put ("wallet", wallet_id.pub.to_string ());
request2.put ("account", account.to_account ());
auto response2 (test_response (request2, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response2.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response2.second)));
ASSERT_TRUE (wallet->exists (account));
ASSERT_NE (wallet->free_accounts.end (), wallet->free_accounts.find (account));
rpc.stop();
@ -1003,7 +1002,7 @@ TEST (rpc, payment_end_nonempty)
request1.put ("wallet", wallet_id.to_string ());
request1.put ("account", rai::test_genesis_key.pub.to_account ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::bad_request, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::bad_request, static_cast <uint16_t> (boost::network::http::status (response1.second)));
rpc.stop();
thread1.join();
}
@ -1024,7 +1023,7 @@ TEST (rpc, payment_zero_balance)
request1.put ("action", "payment_begin");
request1.put ("wallet", wallet_id.to_string ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
auto account_text (response1.first.get <std::string> ("account"));
rai::uint256_union account;
ASSERT_FALSE (account.decode_account (account_text));
@ -1049,7 +1048,7 @@ TEST (rpc, payment_begin_reuse)
request1.put ("action", "payment_begin");
request1.put ("wallet", wallet_id.pub.to_string ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
auto account_text (response1.first.get <std::string> ("account"));
rai::uint256_union account;
ASSERT_FALSE (account.decode_account (account_text));
@ -1060,11 +1059,11 @@ TEST (rpc, payment_begin_reuse)
request2.put ("wallet", wallet_id.pub.to_string ());
request2.put ("account", account.to_account ());
auto response2 (test_response (request2, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response2.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response2.second)));
ASSERT_TRUE (wallet->exists (account));
ASSERT_NE (wallet->free_accounts.end (), wallet->free_accounts.find (account));
auto response3 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response3.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response3.second)));
auto account2_text (response1.first.get <std::string> ("account"));
rai::uint256_union account2;
ASSERT_FALSE (account2.decode_account (account2_text));
@ -1094,7 +1093,7 @@ TEST (rpc, payment_begin_locked)
request1.put ("action", "payment_begin");
request1.put ("wallet", wallet_id.pub.to_string ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::bad_request, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::bad_request, static_cast <uint16_t> (boost::network::http::status (response1.second)));
rpc.stop();
thread1.join();
}
@ -1118,7 +1117,7 @@ TEST (rpc, DISABLED_payment_wait)
request1.put ("amount", rai::amount (rai::Mrai_ratio).to_string_dec ());
request1.put ("timeout", "100");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("nothing", response1.first.get <std::string> ("status"));
request1.put ("timeout", "100000");
system.wallet (0)->send_action (rai::test_genesis_key.pub, key.pub, rai::Mrai_ratio);
@ -1127,11 +1126,11 @@ TEST (rpc, DISABLED_payment_wait)
system.wallet (0)->send_action (rai::test_genesis_key.pub, key.pub, rai::Mrai_ratio);
});
auto response2 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response2.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response2.second)));
ASSERT_EQ ("success", response2.first.get <std::string> ("status"));
request1.put ("amount", rai::amount (rai::Mrai_ratio * 2).to_string_dec ());
auto response3 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response3.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response3.second)));
ASSERT_EQ ("success", response2.first.get <std::string> ("status"));
node1->stop ();
rpc.stop();
@ -1149,7 +1148,7 @@ TEST (rpc, peers)
boost::property_tree::ptree request;
request.put ("action", "peers");
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto & frontiers_node (response.first.get_child ("peers"));
ASSERT_EQ (1, frontiers_node.size ());
rpc.stop();
@ -1195,7 +1194,7 @@ TEST (rpc, search_pending)
request.put ("action", "search_pending");
request.put ("wallet", wallet);
auto response (test_response (request, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response.second)));
auto iterations (0);
while (system.nodes [0]->balance (rai::test_genesis_key.pub) != rai::genesis_amount)
{
@ -1222,9 +1221,9 @@ TEST (rpc, version)
boost::property_tree::ptree request1;
request1.put ("action", "version");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("1", response1.first.get <std::string> ("rpc_version"));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("2", response1.first.get <std::string> ("store_version"));
rpc.stop();
thread1.join ();
@ -1247,7 +1246,7 @@ TEST (rpc, work_generate)
request1.put ("action", "work_generate");
request1.put ("hash", hash1.to_string ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
auto work1 (response1.first.get <std::string> ("work"));
uint64_t work2;
ASSERT_FALSE (rai::from_string_hex (work1, work2));
@ -1278,7 +1277,7 @@ TEST (rpc, work_cancel)
work = system.work.generate_maybe (hash1);
});
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
thread.join ();
rpc.stop();
thread1.join ();
@ -1405,7 +1404,7 @@ TEST (rpc, block_count)
boost::property_tree::ptree request1;
request1.put ("action", "block_count");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("1", response1.first.get <std::string> ("count"));
rpc.stop ();
node1.stop ();
@ -1424,7 +1423,7 @@ TEST (rpc, frontier_count)
boost::property_tree::ptree request1;
request1.put ("action", "frontier_count");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("1", response1.first.get <std::string> ("count"));
rpc.stop ();
node1.stop ();
@ -1443,13 +1442,13 @@ TEST (rpc, available_supply)
boost::property_tree::ptree request1;
request1.put ("action", "available_supply");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("0", response1.first.get <std::string> ("available"));
system.wallet (0)->insert_adhoc (rai::test_genesis_key.prv);
rai::keypair key;
auto block (system.wallet (0)->send_action (rai::test_genesis_key.pub, key.pub, 1));
auto response2 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response2.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response2.second)));
ASSERT_EQ ("1", response2.first.get <std::string> ("available"));
rpc.stop ();
node1.stop ();
@ -1469,7 +1468,7 @@ TEST (rpc, mrai_to_raw)
request1.put ("action", "mrai_to_raw");
request1.put ("amount", "1");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ (rai::Mrai_ratio.convert_to <std::string> (), response1.first.get <std::string> ("amount"));
rpc.stop ();
node1.stop ();
@ -1489,7 +1488,7 @@ TEST (rpc, mrai_from_raw)
request1.put ("action", "mrai_from_raw");
request1.put ("amount", rai::Mrai_ratio.convert_to <std::string> ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("1", response1.first.get <std::string> ("amount"));
rpc.stop ();
node1.stop ();
@ -1509,7 +1508,7 @@ TEST (rpc, krai_to_raw)
request1.put ("action", "krai_to_raw");
request1.put ("amount", "1");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ (rai::krai_ratio.convert_to <std::string> (), response1.first.get <std::string> ("amount"));
rpc.stop ();
node1.stop ();
@ -1529,7 +1528,7 @@ TEST (rpc, krai_from_raw)
request1.put ("action", "krai_from_raw");
request1.put ("amount", rai::krai_ratio.convert_to <std::string> ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("1", response1.first.get <std::string> ("amount"));
rpc.stop ();
node1.stop ();
@ -1549,7 +1548,7 @@ TEST (rpc, rai_to_raw)
request1.put ("action", "rai_to_raw");
request1.put ("amount", "1");
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ (rai::rai_ratio.convert_to <std::string> (), response1.first.get <std::string> ("amount"));
rpc.stop ();
node1.stop ();
@ -1569,7 +1568,7 @@ TEST (rpc, rai_from_raw)
request1.put ("action", "rai_from_raw");
request1.put ("amount", rai::rai_ratio.convert_to <std::string> ());
auto response1 (test_response (request1, rpc, system.service));
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, response1.second);
ASSERT_EQ (boost::network::http::server <rai::rpc>::response::ok, static_cast <uint16_t> (boost::network::http::status (response1.second)));
ASSERT_EQ ("1", response1.first.get <std::string> ("amount"));
rpc.stop ();
node1.stop ();