Fix maxuploadtarget recommended minimum calculation

jonasschnelli · jonasschnelli · commit d2ce6d39f6e8 · 2016-08-26T09:23:45.000+02:00
diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md
@@ -19,8 +19,8 @@ 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.
+**The current recommended minimum is 288MiB, assuming an average serialized block size of 2MB.**
 
 Whitelisted peers will never be disconnected, although their traffic counts for
 calculating the target.
diff --git a/src/net.cpp b/src/net.cpp
@@ -2193,11 +2193,12 @@ void CNode::RecordBytesSent(uint64_t bytes)
 void CNode::SetMaxOutboundTarget(uint64_t limit)
 {
     LOCK(cs_totalBytesSent);
-    uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE;
+    // assume the average size of serialized blocks is half the maximum
+    uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE / 2;
     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);
+        LogPrintf("Max outbound target is very small (%s MiB) and will be overshot. Recommended minimum is %s MiB.\n", nMaxOutboundLimit/1024.0/1024.0, recommendedMinimum/1024.0/1024.0);
 }
 
 uint64_t CNode::GetMaxOutboundTarget()

Original file line number	Diff line number	Diff line change
`@@ -2193,11 +2193,12 @@ void CNode::RecordBytesSent(uint64_t bytes)`
`2193`	`2193`	`void CNode::SetMaxOutboundTarget(uint64_t limit)`
`2194`	`2194`	`{`
`2195`	`2195`	`LOCK(cs_totalBytesSent);`
`2196`		`- uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE;`
	`2196`	`+ // assume the average size of serialized blocks is half the maximum`
	`2197`	`+ uint64_t recommendedMinimum = (nMaxOutboundTimeframe / 600) * MAX_BLOCK_SERIALIZED_SIZE / 2;`
`2197`	`2198`	`nMaxOutboundLimit = limit;`
`2198`	`2199`
`2199`	`2200`	`if (limit > 0 && limit < recommendedMinimum)`
`2200`		`- LogPrintf("Max outbound target is very small (%s bytes) and will be overshot. Recommended minimum is %s bytes.\n", nMaxOutboundLimit, recommendedMinimum);`
	`2201`	`+ LogPrintf("Max outbound target is very small (%s MiB) and will be overshot. Recommended minimum is %s MiB.\n", nMaxOutboundLimit/1024.0/1024.0, recommendedMinimum/1024.0/1024.0);`
`2201`	`2202`	`}`
`2202`	`2203`
`2203`	`2204`	`uint64_t CNode::GetMaxOutboundTarget()`