aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-04-07 13:52:31 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-04-07 13:52:39 +0200
commit5851915a006ace71493f54665322e41001fb3ac3 (patch)
tree558ebc7fa8689109c7cb697a3ef5ec638725b2c9
parent1ddf0cee679d4f06b03ce1a06b7ff0a430627e40 (diff)
parent62b9a557fca2aa55803c336ffcceccc50ccf0c3e (diff)
Merge #7832: Reduce block timeout to 10 minutes
62b9a55 Reduce block timeout to 10 minutes (Wladimir J. van der Laan)
-rw-r--r--src/main.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h
index 68fcf8e7c9..0962f44e94 100644
--- a/src/main.h
+++ b/src/main.h
@@ -106,8 +106,8 @@ static const unsigned int AVG_INVENTORY_BROADCAST_INTERVAL = 5;
static const unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60;
/** Maximum feefilter broadcast delay after significant change. */
static const unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60;
-/** Block download timeout base, expressed in millionths of the block interval (i.e. 20 min) */
-static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 2000000;
+/** Block download timeout base, expressed in millionths of the block interval (i.e. 10 min) */
+static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
/** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;