fixup Implement block size/sigop cost rules, limits, and GBT support: update block cost comment

sipa · sipa · commit 64c15279f597 · 2016-04-23T13:11:51.000+02:00
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
@@ -34,8 +34,9 @@ std::string CBlock::ToString() const
 
 int64_t GetBlockCost(const CBlock& block)
 {
-    // The intended approximate formula is: cost = base_size * 4 + witness_size.
-    // We can only serialize base or base+witness, so the formula
-    // becomes: cost = base_size * 3 + total_size.
+    // This implements the cost = base_size * 4 + witness_size formula, using only
+    // serialization with and without witness data. As witness_size is equal to
+    // total_size - base_size, this formula is identical to:
+    // cost = base_size * 3 + total_size.
     return ::GetSerializeSize(block, SER_NETWORK, 0) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(block, SER_NETWORK, SERIALIZE_TRANSACTION_WITNESS);
 }

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,9 @@ std::string CBlock::ToString() const`
`34`	`34`
`35`	`35`	`int64_t GetBlockCost(const CBlock& block)`
`36`	`36`	`{`
`37`		`- // The intended approximate formula is: cost = base_size * 4 + witness_size.`
`38`		`- // We can only serialize base or base+witness, so the formula`
`39`		`- // becomes: cost = base_size * 3 + total_size.`
	`37`	`+ // This implements the cost = base_size * 4 + witness_size formula, using only`
	`38`	`+ // serialization with and without witness data. As witness_size is equal to`
	`39`	`+ // total_size - base_size, this formula is identical to:`
	`40`	`+ // cost = base_size * 3 + total_size.`
`40`	`41`	`return ::GetSerializeSize(block, SER_NETWORK, 0) * (WITNESS_SCALE_FACTOR - 1) + ::GetSerializeSize(block, SER_NETWORK, SERIALIZE_TRANSACTION_WITNESS);`
`41`	`42`	`}`