Browse Source

Merge #9155: [trivial] update comments for tx weight

07ede5d update comments for tx weight (Brian Deery)
0.14
MarcoFalke 8 years ago
parent
commit
cb2ed300a8
No known key found for this signature in database
GPG Key ID: 2D7F2372E50FE137
  1. 2
      src/policy/policy.cpp
  2. 2
      src/wallet/test/wallet_tests.cpp

2
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 // Extremely large transactions with lots of inputs can cost the network
// almost as much to process as they cost the sender in fees, because // almost as much to process as they cost the sender in fees, because
// computing signature hashes is O(ninputs*txsize). Limiting transactions // 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); unsigned int sz = GetTransactionWeight(tx);
if (sz >= MAX_STANDARD_TX_WEIGHT) { if (sz >= MAX_STANDARD_TX_WEIGHT) {
reason = "tx-size"; reason = "tx-size";

2
src/wallet/test/wallet_tests.cpp

@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// test with many inputs // test with many inputs
for (CAmount amt=1500; amt < COIN; amt*=10) { for (CAmount amt=1500; amt < COIN; amt*=10) {
empty_wallet(); 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++) for (uint16_t j = 0; j < 676; j++)
add_coin(amt); add_coin(amt);
BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, vCoins, setCoinsRet, nValueRet));

Loading…
Cancel
Save