Merge pull request #83 from evoskuil/version2

Accommodate change to fetch_block, using shared pointer.
libbitcoin · Dec 21, 2015 · e6395bb · e6395bb
2 parents 7e27aa3 + bba6e15
commit e6395bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/include/bitcoin/node/responder.hpp b/include/bitcoin/node/responder.hpp
@@ -22,6 +22,7 @@
 
 #include <atomic>
 #include <cstddef>
+#include <memory>
 #include <system_error>
 #include <bitcoin/blockchain.hpp>
 #include <bitcoin/node/define.hpp>
@@ -68,8 +69,9 @@ class BCN_API responder
     void send_tx_not_found(const hash_digest& tx_hash,
         network::channel_ptr node);
 
-    void send_block(const std::error_code& ec, const block_type& block,
-        const hash_digest& block_hash, network::channel_ptr node);
+    void send_block(const std::error_code& ec,
+        std::shared_ptr<block_type> block, const hash_digest& block_hash,
+        network::channel_ptr node);
     void send_block_not_found(const hash_digest& block_hash,
         network::channel_ptr node);
 

diff --git a/src/responder.cpp b/src/responder.cpp
@@ -21,6 +21,7 @@
 
 #include <cmath>
 #include <functional>
+#include <memory>
 #include <system_error>
 #include <bitcoin/blockchain.hpp>
 #include <bitcoin/node/inventory.hpp>
@@ -173,8 +174,9 @@ void responder::new_block_get_data(const get_data_type& packet,
 }
 
 // Should we look in the orphan pool first?
-void responder::send_block(const std::error_code& ec, const block_type& block,
-    const hash_digest& block_hash, channel_ptr node)
+void responder::send_block(const std::error_code& ec,
+    std::shared_ptr<block_type> block, const hash_digest& block_hash,
+    channel_ptr node)
 {
     if (ec == error::service_stopped)
         return;
@@ -209,7 +211,7 @@ void responder::send_block(const std::error_code& ec, const block_type& block,
                 << "] " << encode_hash(block_hash);
     };
 
-    node->send(block, send_handler);
+    node->send(*block, send_handler);
 }
 
 void responder::send_block_not_found(const hash_digest& block_hash,