aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2016-11-16 11:05:30 +0100
committerMarcoFalke <[email protected]>2016-11-16 11:05:40 +0100
commitcb2ed300a89ebf9f0654da869ced665ed8b2abe7 (patch)
tree7753e4c6bb75b26b209c90bce6e337e8d075cf30 /src
parentMerge #9168: [qa] add assert_raises_message to check specific error message (diff)
parentupdate comments for tx weight (diff)
downloaddiscoin-cb2ed300a89ebf9f0654da869ced665ed8b2abe7.tar.xz
discoin-cb2ed300a89ebf9f0654da869ced665ed8b2abe7.zip
Merge #9155: [trivial] update comments for tx weight
07ede5d update comments for tx weight (Brian Deery)
Diffstat (limited to 'src')
-rw-r--r--src/policy/policy.cpp2
-rw-r--r--src/wallet/test/wallet_tests.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index a3eee474a..3ad1ff7ba 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -66,7 +66,7 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnes
// Extremely large transactions with lots of inputs can cost the network
// almost as much to process as they cost the sender in fees, because
// computing signature hashes is O(ninputs*txsize). Limiting transactions
- // to MAX_STANDARD_TX_SIZE mitigates CPU exhaustion attacks.
+ // to MAX_STANDARD_TX_WEIGHT mitigates CPU exhaustion attacks.
unsigned int sz = GetTransactionWeight(tx);
if (sz >= MAX_STANDARD_TX_WEIGHT) {
reason = "tx-size";
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index acf980c78..ecbbcb145 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// test with many inputs
for (CAmount amt=1500; amt < COIN; amt*=10) {
empty_wallet();
- // Create 676 inputs (= MAX_STANDARD_TX_SIZE / 148 bytes per input)
+ // Create 676 inputs (= (old MAX_STANDARD_TX_SIZE == 100000) / 148 bytes per input)
for (uint16_t j = 0; j < 676; j++)
add_coin(amt);
BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, vCoins, setCoinsRet, nValueRet));