Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

renames ApiCoreInfoComponent to ApiCoreInfo and updates references in ApiServer

Browse source
This commit is contained in:
snider 2025-10-16 17:06:57 +01:00
parent 60df03ff1f
commit 53f266cbee
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/api/ApiServer.cpp
View file

@ -13,15 +13,15 @@
//
#include "ApiServer.hpp"
#include "controller/ApiCoreInfoComponent.hpp"
#include "controller/ApiCoreInfo.hpp"
#include "controller/path/info.hpp"
#include "controller/path/block.hpp"
#include "controller/path/block/hash.hpp"
#include "controller/path/block/id.hpp"
#include "controller/path/info/version.hpp"
#include "oatpp/network/Server.hpp"
#include "oatpp-swagger/Controller.hpp"
#include <iostream>
#include "version.h"
#include "common/command_line.h"
@ -55,9 +55,9 @@ void ApiServer::run() {
/* Register Components in scope of run() method */
Components components;
OATPP_CREATE_COMPONENT(std::shared_ptr<ApiCoreInfoComponent>, coreInfoComponent)
OATPP_CREATE_COMPONENT(std::shared_ptr<ApiCoreInfo>, coreInfoComponent)
([this] {
return std::make_shared<ApiCoreInfoComponent>(*m_ccore, *m_p2p, *m_rpc_server);
return std::make_shared<ApiCoreInfo>(*m_ccore, *m_p2p, *m_rpc_server);
}());
/* Get router component */
@ -65,11 +65,20 @@ void ApiServer::run() {
auto docEndpoints = std::make_shared<oatpp::web::server::api::Endpoints>();
/* Create and register controllers */
/*
* Create and register controllers, this list will get VERY large, but, it has to be this way as oatpp creates a
* static routing file before compile time, can't dynamically add controllers, or, be smart AND also have project code awareness
* by this list being large, it allows for per endpoint code separation;
* any PR that tries to reduce this, MUST have unit tests to prove it works, no exceptions.
*/
auto infoController = std::make_shared<InfoController>();
docEndpoints->append(infoController->getEndpoints());
router->addController(infoController);
auto infoVersionController = std::make_shared<InfoVersionController>();
docEndpoints->append(infoVersionController->getEndpoints());
router->addController(infoVersionController);
auto blockController = std::make_shared<BlockController>();
docEndpoints->append(blockController->getEndpoints());
router->addController(blockController);

10
src/api/controller/ApiCoreInfoComponent.hpp → src/api/controller/ApiCoreInfo.hpp
View file

@ -12,8 +12,8 @@
// SPDX‑License‑Identifier: EUPL-1.2
//
#ifndef ApiCoreInfoComponent_hpp
#define ApiCoreInfoComponent_hpp
#ifndef ApiCoreInfo_hpp
#define ApiCoreInfo_hpp
#include "currency_core/currency_core.h"
#include "p2p/net_node.h"
@ -24,14 +24,14 @@
typedef nodetool::node_server<currency::t_currency_protocol_handler<currency::core>> p2psrv_t;
// A simple holder for core blockchain components that can be injected into controllers.
class ApiCoreInfoComponent {
class ApiCoreInfo {
private:
currency::core& m_core;
p2psrv_t& m_p2p;
currency::core_rpc_server& m_rpc_server;
public:
ApiCoreInfoComponent(currency::core& core, p2psrv_t& p2p, currency::core_rpc_server& rpc_server)
ApiCoreInfo(currency::core& core, p2psrv_t& p2p, currency::core_rpc_server& rpc_server)
: m_core(core), m_p2p(p2p), m_rpc_server(rpc_server)
{}
@ -40,4 +40,4 @@ public:
currency::core_rpc_server& getRpcServer() { return m_rpc_server; }
};
#endif /* ApiCoreInfoComponent_hpp */
#endif /* ApiCoreInfo_hpp */