Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fixed issue-11

Browse source
This commit is contained in:
Anzhy Cherrnyavski 2019-02-14 15:46:09 +03:00
parent 113ba26632
commit 2142bc4d08
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/sidechain/network/include/sidechain/network/sidechain_net_manager.hpp
View file

@ -16,6 +16,8 @@ public:
sidechain_net_manager( graphene::chain::database* _db, std::string _ip, sidechain_net_manager( graphene::chain::database* _db, std::string _ip,
uint32_t _zmq, uint32_t _rpc, std::string _user, std::string _password ); uint32_t _zmq, uint32_t _rpc, std::string _user, std::string _password );
~sidechain_net_manager() { db = nullptr; }
void initialize_manager( graphene::chain::database* _db, std::string _ip, void initialize_manager( graphene::chain::database* _db, std::string _ip,
uint32_t _zmq, uint32_t _rpc, std::string _user, std::string _password ); uint32_t _zmq, uint32_t _rpc, std::string _user, std::string _password );
@ -43,7 +45,7 @@ private:
std::unique_ptr<zmq_listener> listener; std::unique_ptr<zmq_listener> listener;
std::unique_ptr<bitcoin_rpc_client> bitcoin_client; std::unique_ptr<bitcoin_rpc_client> bitcoin_client;
std::unique_ptr<graphene::chain::database> db; graphene::chain::database* db;
}; };

8
libraries/sidechain/network/sidechain_net_manager.cpp
View file

@ -23,10 +23,6 @@ sidechain_net_manager::sidechain_net_manager( graphene::chain::database* _db, st
void sidechain_net_manager::initialize_manager( graphene::chain::database* _db, std::string _ip, void sidechain_net_manager::initialize_manager( graphene::chain::database* _db, std::string _ip,
uint32_t _zmq, uint32_t _rpc, std::string _user, std::string _password ) uint32_t _zmq, uint32_t _rpc, std::string _user, std::string _password )
{ {
listener = std::unique_ptr<zmq_listener>( new zmq_listener( _ip, _zmq ) );
bitcoin_client = std::unique_ptr<bitcoin_rpc_client>( new bitcoin_rpc_client( _ip, _rpc, _user, _password ) );
db = std::unique_ptr<graphene::chain::database>( _db );
fc::http::connection conn; fc::http::connection conn;
try { try {
conn.connect_to( fc::ip::endpoint( fc::ip::address( _ip ), _rpc ) ); conn.connect_to( fc::ip::endpoint( fc::ip::address( _ip ), _rpc ) );
@ -35,6 +31,10 @@ void sidechain_net_manager::initialize_manager( graphene::chain::database* _db,
FC_ASSERT( false ); FC_ASSERT( false );
} }
listener = std::unique_ptr<zmq_listener>( new zmq_listener( _ip, _zmq ) );
bitcoin_client = std::unique_ptr<bitcoin_rpc_client>( new bitcoin_rpc_client( _ip, _rpc, _user, _password ) );
db = _db;
listener->block_received.connect([this]( const std::string& block_hash ) { listener->block_received.connect([this]( const std::string& block_hash ) {
std::thread( &sidechain_net_manager::handle_block, this, block_hash ).detach(); std::thread( &sidechain_net_manager::handle_block, this, block_hash ).detach();
} ); } );