aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2016-09-14 08:32:12 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2016-09-14 08:32:35 +0200
commit57b34599b2deb179ff1bd97ffeab91ec9f904d85 (patch)
tree2916f0c5cc5ab3ef6edb5e3c47e99826a6950a33
parentfa7caf6d9116c35433a2069174f4c66f051d52ba (diff)
parent1b6bcdd3aa379a50c960e23d7c55db8294e76f7f (diff)
downloadbitcoin-57b34599b2deb179ff1bd97ffeab91ec9f904d85.tar.xz
Merge #8712: Remove maxuploadtargets recommended minimum
1b6bcdd Remove maxuploadtargets recommended minimum (Jonas Schnelli)
-rw-r--r--doc/reduce-traffic.md3
-rw-r--r--src/net.cpp4
2 files changed, 1 insertions, 6 deletions
diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md
index 2d86588eb2..697099beab 100644
--- a/doc/reduce-traffic.md
+++ b/doc/reduce-traffic.md
@@ -19,8 +19,7 @@ This is *not* a hard limit; only a threshold to minimize the outbound
traffic. When the limit is about to be reached, the uploaded data is cut by no
longer serving historic blocks (blocks older than one week).
Keep in mind that new nodes require other nodes that are willing to serve
-historic blocks. **The recommended minimum is 144 blocks per day (max. 144MB
-per day)**
+historic blocks.
Whitelisted peers will never be disconnected, although their traffic counts for
calculating the target.
diff --git a/src/net.cpp b/src/net.cpp
index b39ef9f54a..888ed44377 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2362,11 +2362,7 @@ void CConnman::RecordBytesSent(uint64_t bytes)
void CConnman::SetMaxOutboundTarget(uint64_t limit)
{
LOCK(cs_totalBytesSent);
- uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE;
nMaxOutboundLimit = limit;
-
- if (limit > 0 && limit < recommendedMinimum)
- LogPrintf("Max outbound target is very small (%s bytes) and will be overshot. Recommended minimum is %s bytes.\n", nMaxOutboundLimit, recommendedMinimum);
}
uint64_t CConnman::GetMaxOutboundTarget()