Merge pull request #287 from evoskuil/master

Break inventory handler recursion, remove dead config.

Author: evoskuil

console/executor.cpp

@@ -120,9 +120,8 @@ bool executor::do_initchain()
     {
         LOG_INFO(LOG_NODE) << format(BN_INITIALIZING_CHAIN) % directory;
 
-        const auto testnet = metadata_.configured.chain.easy_blocks;
-
         // Unfortunately we are limited to a choice of hardcoded chains.
+        auto testnet = (metadata_.configured.network.identifier == 118034699u);
         const auto genesis = testnet ? block::genesis_testnet() :
             block::genesis_mainnet();
 

data/bn.cfg

@@ -151,10 +151,6 @@ bip65 = true
 bip90 = true
 
 [node]
-# The maximum number of initial block download peers, defaults to 0 (physical cores).
-sync_peers = 0
-# The time limit for block response during initial block download, defaults to 5.
-sync_timeout_seconds = 5
 # The time period for block polling after initial block download, defaults to 1 (0 disables).
 block_poll_seconds = 1
 # The minimum fee per byte required for transaction acceptance, defaults to 1.

src/protocols/protocol_block_out.cpp

@@ -413,7 +413,9 @@ void protocol_block_out::handle_send_next(const code& ec,
 
     BITCOIN_ASSERT(!inventory->inventories().empty());
     inventory->inventories().pop_back();
-    send_next_data(inventory);
+
+    // Break off recursion.
+    DISPATCH_CONCURRENT1(send_next_data, inventory);
 }
 
 // Subscription.

src/protocols/protocol_transaction_out.cpp

@@ -194,8 +194,6 @@ void protocol_transaction_out::send_transaction(const code& ec,
         BITCOIN_ASSERT(!inventory->inventories().empty());
         const not_found reply{ inventory->inventories().back() };
         SEND2(reply, handle_send, _1, reply.command);
-
-        // TODO: recursion hazard.
         handle_send_next(error::success, inventory);
         return;
     }
@@ -220,7 +218,9 @@ void protocol_transaction_out::handle_send_next(const code& ec,
 
     BITCOIN_ASSERT(!inventory->inventories().empty());
     inventory->inventories().pop_back();
-    send_next_data(inventory);
+
+    // Break off recursion.
+    DISPATCH_CONCURRENT1(send_next_data, inventory);
 }
 
 // Subscription.

src/sessions/session_block_sync.cpp

@@ -60,7 +60,7 @@ void session_block_sync::start(result_handler handler)
 {
     // TODO: create session_timer base class and pass interval via start.
     timer_ = std::make_shared<deadline>(pool_, regulator_interval);
-    session::start(CONCURRENT2(handle_started, _1, handler));
+    session::start(CONCURRENT_DELEGATE2(handle_started, _1, handler));
 }
 
 void session_block_sync::handle_started(const code& ec, result_handler handler)

src/sessions/session_header_sync.cpp

@@ -69,7 +69,7 @@ session_header_sync::session_header_sync(full_node& network,
 
 void session_header_sync::start(result_handler handler)
 {
-    session::start(CONCURRENT2(handle_started, _1, handler));
+    session::start(CONCURRENT_DELEGATE2(handle_started, _1, handler));
 }
 
 void session_header_sync::handle_started(const code& ec,