forked from nanocurrency/nano-node
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move rpc_context and test_response classes into their own files.
The file nano/rpc_test/common.hpp was very confusing, a lot of stuff was dumped into one file and it was hard to read. This helps break things into more manageable pieces.
- Loading branch information
Showing
9 changed files
with
209 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,69 +1,26 @@ | ||
#pragma once | ||
|
||
#include <boost/asio/io_context.hpp> | ||
#include <boost/asio/ip/tcp.hpp> | ||
#include <boost/beast/core/flat_buffer.hpp> | ||
#include <boost/beast/http.hpp> | ||
#include <boost/property_tree/ptree.hpp> | ||
|
||
#include <memory> | ||
|
||
using namespace std::chrono_literals; | ||
|
||
namespace nano | ||
{ | ||
class ipc_rpc_processor; | ||
class node; | ||
class node_config; | ||
class node_flags; | ||
class node_rpc_config; | ||
class public_key; | ||
class rpc; | ||
using account = public_key; | ||
|
||
namespace store | ||
{ | ||
class component; | ||
} | ||
|
||
using account = public_key; | ||
namespace ipc | ||
{ | ||
class ipc_server; | ||
} | ||
namespace test | ||
{ | ||
class system; | ||
class test_response | ||
{ | ||
public: | ||
test_response (boost::property_tree::ptree const & request_a, boost::asio::io_context & io_ctx_a); | ||
test_response (boost::property_tree::ptree const & request_a, uint16_t port_a, boost::asio::io_context & io_ctx_a); | ||
void run (uint16_t port_a); | ||
boost::property_tree::ptree const & request; | ||
boost::asio::ip::tcp::socket sock; | ||
boost::property_tree::ptree json; | ||
boost::beast::flat_buffer sb; | ||
boost::beast::http::request<boost::beast::http::string_body> req; | ||
boost::beast::http::response<boost::beast::http::string_body> resp; | ||
std::atomic<int> status{ 0 }; | ||
}; | ||
class rpc_context | ||
{ | ||
public: | ||
rpc_context (std::shared_ptr<nano::rpc> & rpc_a, std::unique_ptr<nano::ipc::ipc_server> & ipc_server_a, std::unique_ptr<nano::ipc_rpc_processor> & ipc_rpc_processor_a, std::unique_ptr<nano::node_rpc_config> & node_rpc_config_a); | ||
|
||
std::shared_ptr<nano::rpc> rpc; | ||
std::unique_ptr<nano::ipc::ipc_server> ipc_server; | ||
std::unique_ptr<nano::ipc_rpc_processor> ipc_rpc_processor; | ||
std::unique_ptr<nano::node_rpc_config> node_rpc_config; | ||
}; | ||
|
||
std::shared_ptr<nano::node> add_ipc_enabled_node (nano::test::system & system, nano::node_config & node_config, nano::node_flags const & node_flags); | ||
std::shared_ptr<nano::node> add_ipc_enabled_node (nano::test::system & system, nano::node_config & node_config); | ||
std::shared_ptr<nano::node> add_ipc_enabled_node (nano::test::system & system); | ||
void reset_confirmation_height (nano::store::component & store, nano::account const & account); | ||
void wait_response_impl (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, std::chrono::duration<double, std::nano> const & time, boost::property_tree::ptree & response_json); | ||
boost::property_tree::ptree wait_response (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, std::chrono::duration<double, std::nano> const & time = 5s); | ||
bool check_block_response_count (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, uint64_t size_count); | ||
rpc_context add_rpc (nano::test::system & system, std::shared_ptr<nano::node> const & node_a); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
#include <nano/lib/threading.hpp> | ||
#include <nano/node/ipc/ipc_server.hpp> | ||
#include <nano/node/transport/tcp.hpp> | ||
#include <nano/rpc/rpc_request_processor.hpp> | ||
#include <nano/rpc_test/common.hpp> | ||
#include <nano/rpc_test/rpc_context.hpp> | ||
#include <nano/rpc_test/test_response.hpp> | ||
#include <nano/test_common/system.hpp> | ||
#include <nano/test_common/testutil.hpp> | ||
|
||
#include <gtest/gtest.h> | ||
|
||
#include <boost/property_tree/json_parser.hpp> | ||
|
||
nano::test::rpc_context::rpc_context (std::shared_ptr<nano::rpc> & rpc_a, std::unique_ptr<nano::ipc::ipc_server> & ipc_server_a, std::unique_ptr<nano::ipc_rpc_processor> & ipc_rpc_processor_a, std::unique_ptr<nano::node_rpc_config> & node_rpc_config_a) | ||
{ | ||
rpc = std::move (rpc_a); | ||
ipc_server = std::move (ipc_server_a); | ||
ipc_rpc_processor = std::move (ipc_rpc_processor_a); | ||
node_rpc_config = std::move (node_rpc_config_a); | ||
} | ||
|
||
void nano::test::wait_response_impl (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, std::chrono::duration<double, std::nano> const & time, boost::property_tree::ptree & response_json) | ||
{ | ||
test_response response (request, rpc_ctx.rpc->listening_port (), system.io_ctx); | ||
ASSERT_TIMELY (time, response.status != 0); | ||
ASSERT_EQ (200, response.status); | ||
response_json = response.json; | ||
} | ||
|
||
boost::property_tree::ptree nano::test::wait_response (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, std::chrono::duration<double, std::nano> const & time) | ||
{ | ||
boost::property_tree::ptree response_json; | ||
wait_response_impl (system, rpc_ctx, request, time, response_json); | ||
return response_json; | ||
} | ||
|
||
bool nano::test::check_block_response_count (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, uint64_t size_count) | ||
{ | ||
auto response (wait_response (system, rpc_ctx, request)); | ||
auto & blocks = response.get_child ("blocks"); | ||
return size_count == blocks.size (); | ||
} | ||
|
||
nano::test::rpc_context nano::test::add_rpc (nano::test::system & system, std::shared_ptr<nano::node> const & node_a) | ||
{ | ||
auto node_rpc_config (std::make_unique<nano::node_rpc_config> ()); | ||
auto ipc_server (std::make_unique<nano::ipc::ipc_server> (*node_a, *node_rpc_config)); | ||
nano::rpc_config rpc_config (node_a->network_params.network, system.get_available_port (), true); | ||
const auto ipc_tcp_port = ipc_server->listening_tcp_port (); | ||
debug_assert (ipc_tcp_port.has_value ()); | ||
auto ipc_rpc_processor (std::make_unique<nano::ipc_rpc_processor> (system.io_ctx, rpc_config, ipc_tcp_port.value ())); | ||
auto rpc (std::make_shared<nano::rpc> (system.io_ctx, rpc_config, *ipc_rpc_processor)); | ||
rpc->start (); | ||
|
||
return rpc_context{ rpc, ipc_server, ipc_rpc_processor, node_rpc_config }; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
#pragma once | ||
|
||
#include <boost/property_tree/ptree.hpp> | ||
|
||
namespace nano | ||
{ | ||
class ipc_rpc_processor; | ||
class node; | ||
class node_rpc_config; | ||
class public_key; | ||
class rpc; | ||
using account = public_key; | ||
|
||
namespace ipc | ||
{ | ||
class ipc_server; | ||
} | ||
|
||
namespace test | ||
{ | ||
class system; | ||
class rpc_context | ||
{ | ||
public: | ||
rpc_context (std::shared_ptr<nano::rpc> & rpc_a, std::unique_ptr<nano::ipc::ipc_server> & ipc_server_a, std::unique_ptr<nano::ipc_rpc_processor> & ipc_rpc_processor_a, std::unique_ptr<nano::node_rpc_config> & node_rpc_config_a); | ||
|
||
std::shared_ptr<nano::rpc> rpc; | ||
std::unique_ptr<nano::ipc::ipc_server> ipc_server; | ||
std::unique_ptr<nano::ipc_rpc_processor> ipc_rpc_processor; | ||
std::unique_ptr<nano::node_rpc_config> node_rpc_config; | ||
}; | ||
|
||
void wait_response_impl (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, std::chrono::duration<double, std::nano> const & time, boost::property_tree::ptree & response_json); | ||
|
||
boost::property_tree::ptree wait_response (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, std::chrono::duration<double, std::nano> const & time = 5s); | ||
|
||
bool check_block_response_count (nano::test::system & system, rpc_context const & rpc_ctx, boost::property_tree::ptree & request, uint64_t size_count); | ||
rpc_context add_rpc (nano::test::system & system, std::shared_ptr<nano::node> const & node_a); | ||
} | ||
} |
Oops, something went wrong.