Merge pull request #89 from evoskuil/master

Inherit server_node from full_node.

Author: pmienk

include/bitcoin/server/server_node.hpp

@@ -30,7 +30,7 @@ namespace libbitcoin {
 namespace server {
 
 class BCS_API server_node
-  /* : full_node */
+  : public node::full_node
 {
 public:
     typedef std::function<void (size_t, const bc::block_type&)>
@@ -41,66 +41,49 @@ class BCS_API server_node
     server_node(settings_type& config);
     bool start(settings_type& config);
 
-    // Should only be called from the main thread.
-    // It's an error to join() a thread from inside it.
-    bool stop();
+    virtual void subscribe_blocks(block_notify_callback notify_block);
+    virtual void subscribe_transactions(transaction_notify_callback notify_tx);
 
-    void subscribe_blocks(block_notify_callback notify_block);
-    void subscribe_transactions(transaction_notify_callback notify_tx);
-
-    // Access to underlying services.
-    bc::chain::blockchain& blockchain();
-    bc::chain::transaction_pool& transaction_pool();
-    bc::node::transaction_indexer& transaction_indexer();
-    bc::network::protocol& protocol();
+    static void fullnode_fetch_history(server_node& node,
+        const incoming_message& request, queue_send_callback queue_send);
 
-    // Threadpool for memory related operations.
-    bc::threadpool& memory_related_threadpool();
+protected:
+    // Result of store operation in transaction pool.
+    virtual void new_unconfirm_valid_tx(const std::error_code& ec,
+        const index_list& unconfirmed, const transaction_type& tx);
 
-    // TODO: use existing libbitcoin-node implementation.
-    static void fullnode_fetch_history(server_node& node, 
-        const incoming_message& request, queue_send_callback queue_send);
+    virtual void server_node::broadcast_new_blocks(const std::error_code& ec,
+        uint32_t fork_point, const chain::blockchain::block_list& new_blocks,
+        const chain::blockchain::block_list& replaced_blocks);
 
 private:
     typedef std::vector<block_notify_callback> block_notify_list;
     typedef std::vector<transaction_notify_callback> transaction_notify_list;
 
-    void start_session();
-    void wait_and_retry_start(const std::error_code& ec);
+    // Subscriptions for server API.
+    block_notify_list block_sunscriptions_;
+    transaction_notify_list tx_subscriptions_;
 
-    // New connection has been started.
-    // Subscribe to new transaction messages from the network.
-    void monitor_tx(const std::error_code& ec, bc::network::channel_ptr node);
-    // New transaction message from the network.
-    // Attempt to validate it by storing it in the transaction pool.
-    void recv_transaction(const std::error_code& ec,
-        const bc::transaction_type& tx, bc::network::channel_ptr node);
-    // Result of store operation in transaction pool.
-    void handle_mempool_store(const std::error_code& ec,
-        const bc::index_list& unconfirmed, const bc::transaction_type& tx,
-        bc::network::channel_ptr node);
-
-    void reorganize(const std::error_code& ec, size_t fork_point,
-        const bc::chain::blockchain::block_list& new_blocks,
-        const bc::chain::blockchain::block_list& replaced_blocks);
-
-    bc::ofstream outfile_, errfile_;
-    // Threadpools
-    bc::threadpool network_pool_, disk_pool_, mem_pool_;
-    // Services
-    bc::network::hosts hosts_;
+    // Logs.
+    bc::ofstream outfile_;
+    bc::ofstream errfile_;
+
+    // Services.
+    bc::threadpool network_threads_;
+    bc::threadpool database_threads_;
+    bc::threadpool memory_threads_;
+    bc::network::hosts host_pool_;
     bc::network::handshake handshake_;
     bc::network::network network_;
     bc::network::protocol protocol_;
-    bc::chain::blockchain_impl chain_;
+    bc::chain::blockchain_impl blockchain_;
+    bc::chain::transaction_pool tx_pool_;
+    bc::node::indexer tx_indexer_;
     bc::node::poller poller_;
-    bc::chain::transaction_pool txpool_;
-    bc::node::transaction_indexer indexer_;
     bc::node::session session_;
+    bc::node::responder responder_;
 
-    block_notify_list notify_blocks_;
-    transaction_notify_list notify_txs_;
-
+    // Timer.
     boost::asio::deadline_timer retry_start_timer_;
 };
 

src/dispatch.cpp

@@ -137,6 +137,7 @@ static void show_version(std::ostream& stream)
 static console_result init_chain(const path& directory, std::ostream& output,
     std::ostream& error)
 {
+    // TODO: see github.com/bitcoin/bitcoin/issues/432
     // Create the directory as a convenience for the user, and then use it
     // as sentinel to guard against inadvertent re-initialization.