Browse Source

Merge pull request #7329

9d263bd Typo fixes in comments (Chris Wheeler)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
a8bd616fea
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      qa/rpc-tests/merkle_blocks.py
  2. 2
      src/net.cpp
  3. 2
      src/netbase.cpp
  4. 2
      src/policy/fees.cpp
  5. 6
      src/policy/fees.h
  6. 2
      src/qt/clientmodel.cpp
  7. 2
      src/qt/sendcoinsdialog.cpp
  8. 2
      src/test/merkle_tests.cpp
  9. 2
      src/torcontrol.cpp
  10. 2
      src/wallet/rpcwallet.cpp
  11. 2
      src/wallet/wallet_ismine.h

2
qa/rpc-tests/merkle_blocks.py

@ -72,7 +72,7 @@ class MerkleBlockTest(BitcoinTestFramework):
txid_spent = txin_spent["txid"] txid_spent = txin_spent["txid"]
txid_unspent = txid1 if txin_spent["txid"] != txid1 else txid2 txid_unspent = txid1 if txin_spent["txid"] != txid1 else txid2
# We cant find the block from a fully-spent tx # We can't find the block from a fully-spent tx
assert_raises(JSONRPCException, self.nodes[2].gettxoutproof, [txid_spent]) assert_raises(JSONRPCException, self.nodes[2].gettxoutproof, [txid_spent])
# ...but we can if we specify the block # ...but we can if we specify the block
assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid_spent], blockhash)), [txid_spent]) assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid_spent], blockhash)), [txid_spent])

2
src/net.cpp

@ -2177,7 +2177,7 @@ bool CNode::OutboundTargetReached(bool historicalBlockServingLimit)
if (historicalBlockServingLimit) if (historicalBlockServingLimit)
{ {
// keep a large enought buffer to at least relay each block once // keep a large enough buffer to at least relay each block once
uint64_t timeLeftInCycle = GetMaxOutboundTimeLeftInCycle(); uint64_t timeLeftInCycle = GetMaxOutboundTimeLeftInCycle();
uint64_t buffer = timeLeftInCycle / 600 * MAX_BLOCK_SIZE; uint64_t buffer = timeLeftInCycle / 600 * MAX_BLOCK_SIZE;
if (buffer >= nMaxOutboundLimit || nMaxOutboundTotalBytesSentInCycle >= nMaxOutboundLimit - buffer) if (buffer >= nMaxOutboundLimit || nMaxOutboundTotalBytesSentInCycle >= nMaxOutboundLimit - buffer)

2
src/netbase.cpp

@ -140,7 +140,7 @@ bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsign
return false; return false;
do { do {
// Should set the timeout limit to a resonable value to avoid // Should set the timeout limit to a reasonable value to avoid
// generating unnecessary checking call during the polling loop, // generating unnecessary checking call during the polling loop,
// while it can still response to stop request quick enough. // while it can still response to stop request quick enough.
// 2 seconds looks fine in our situation. // 2 seconds looks fine in our situation.

2
src/policy/fees.cpp

@ -87,7 +87,7 @@ double TxConfirmStats::EstimateMedianVal(int confTarget, double sufficientTxVal,
int maxbucketindex = buckets.size() - 1; int maxbucketindex = buckets.size() - 1;
// requireGreater means we are looking for the lowest fee/priority such that all higher // requireGreater means we are looking for the lowest fee/priority such that all higher
// values pass, so we start at maxbucketindex (highest fee) and look at succesively // values pass, so we start at maxbucketindex (highest fee) and look at successively
// smaller buckets until we reach failure. Otherwise, we are looking for the highest // smaller buckets until we reach failure. Otherwise, we are looking for the highest
// fee/priority such that all lower values fail, and we go in the opposite direction. // fee/priority such that all lower values fail, and we go in the opposite direction.
unsigned int startbucket = requireGreater ? maxbucketindex : 0; unsigned int startbucket = requireGreater ? maxbucketindex : 0;

6
src/policy/fees.h

@ -29,7 +29,7 @@ class CTxMemPool;
* included in blocks before transactions of lower fee/priority. So for * included in blocks before transactions of lower fee/priority. So for
* example if you wanted to know what fee you should put on a transaction to * example if you wanted to know what fee you should put on a transaction to
* be included in a block within the next 5 blocks, you would start by looking * be included in a block within the next 5 blocks, you would start by looking
* at the bucket with with the highest fee transactions and verifying that a * at the bucket with the highest fee transactions and verifying that a
* sufficiently high percentage of them were confirmed within 5 blocks and * sufficiently high percentage of them were confirmed within 5 blocks and
* then you would look at the next highest fee bucket, and so on, stopping at * then you would look at the next highest fee bucket, and so on, stopping at
* the last bucket to pass the test. The average fee of transactions in this * the last bucket to pass the test. The average fee of transactions in this
@ -87,13 +87,13 @@ private:
// Count the total # of txs in each bucket // Count the total # of txs in each bucket
// Track the historical moving average of this total over blocks // Track the historical moving average of this total over blocks
std::vector<double> txCtAvg; std::vector<double> txCtAvg;
// and calcuate the total for the current block to update the moving average // and calculate the total for the current block to update the moving average
std::vector<int> curBlockTxCt; std::vector<int> curBlockTxCt;
// Count the total # of txs confirmed within Y blocks in each bucket // Count the total # of txs confirmed within Y blocks in each bucket
// Track the historical moving average of theses totals over blocks // Track the historical moving average of theses totals over blocks
std::vector<std::vector<double> > confAvg; // confAvg[Y][X] std::vector<std::vector<double> > confAvg; // confAvg[Y][X]
// and calcuate the totals for the current block to update the moving averages // and calculate the totals for the current block to update the moving averages
std::vector<std::vector<int> > curBlockConf; // curBlockConf[Y][X] std::vector<std::vector<int> > curBlockConf; // curBlockConf[Y][X]
// Sum the total priority/fee of all tx's in each bucket // Sum the total priority/fee of all tx's in each bucket

2
src/qt/clientmodel.cpp

@ -112,7 +112,7 @@ double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
void ClientModel::updateTimer() void ClientModel::updateTimer()
{ {
// no locking required at this point // no locking required at this point
// the following calls will aquire the required lock // the following calls will acquire the required lock
Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage()); Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent()); Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
} }

2
src/qt/sendcoinsdialog.cpp

@ -791,7 +791,7 @@ void SendCoinsDialog::coinControlUpdateLabels()
if (model->getOptionsModel()->getCoinControlFeatures()) if (model->getOptionsModel()->getCoinControlFeatures())
{ {
// enable minium absolute fee UI controls // enable minimum absolute fee UI controls
ui->radioCustomAtLeast->setVisible(true); ui->radioCustomAtLeast->setVisible(true);
// only enable the feature if inputs are selected // only enable the feature if inputs are selected

2
src/test/merkle_tests.cpp

@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(merkle_test)
int duplicate2 = mutate >= 2 ? 1 << ctz(ntx1) : 0; // Likewise for the second mutation. int duplicate2 = mutate >= 2 ? 1 << ctz(ntx1) : 0; // Likewise for the second mutation.
if (duplicate2 >= ntx1) break; if (duplicate2 >= ntx1) break;
int ntx2 = ntx1 + duplicate2; int ntx2 = ntx1 + duplicate2;
int duplicate3 = mutate >= 3 ? 1 << ctz(ntx2) : 0; // And for the the third mutation. int duplicate3 = mutate >= 3 ? 1 << ctz(ntx2) : 0; // And for the third mutation.
if (duplicate3 >= ntx2) break; if (duplicate3 >= ntx2) break;
int ntx3 = ntx2 + duplicate3; int ntx3 = ntx2 + duplicate3;
// Build a block with ntx different transactions. // Build a block with ntx different transactions.

2
src/torcontrol.cpp

@ -303,7 +303,7 @@ static std::map<std::string,std::string> ParseTorReplyMapping(const std::string
/** Read full contents of a file and return them in a std::string. /** Read full contents of a file and return them in a std::string.
* Returns a pair <status, string>. * Returns a pair <status, string>.
* If an error occured, status will be false, otherwise status will be true and the data will be returned in string. * If an error occurred, status will be false, otherwise status will be true and the data will be returned in string.
* *
* @param maxsize Puts a maximum size limit on the file that is read. If the file is larger than this, truncated data * @param maxsize Puts a maximum size limit on the file that is read. If the file is larger than this, truncated data
* (with len > maxsize) will be returned. * (with len > maxsize) will be returned.

2
src/wallet/rpcwallet.cpp

@ -1423,7 +1423,7 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
" 'send' category of transactions.\n" " 'send' category of transactions.\n"
" \"confirmations\": n, (numeric) The number of confirmations for the transaction. Available for 'send' and \n" " \"confirmations\": n, (numeric) The number of confirmations for the transaction. Available for 'send' and \n"
" 'receive' category of transactions. Negative confirmations indicate the\n" " 'receive' category of transactions. Negative confirmations indicate the\n"
" transation conflicts with the block chain\n" " transaction conflicts with the block chain\n"
" \"trusted\": xxx (bool) Whether we consider the outputs of this unconfirmed transaction safe to spend.\n" " \"trusted\": xxx (bool) Whether we consider the outputs of this unconfirmed transaction safe to spend.\n"
" \"blockhash\": \"hashvalue\", (string) The block hash containing the transaction. Available for 'send' and 'receive'\n" " \"blockhash\": \"hashvalue\", (string) The block hash containing the transaction. Available for 'send' and 'receive'\n"
" category of transactions.\n" " category of transactions.\n"

2
src/wallet/wallet_ismine.h

@ -17,7 +17,7 @@ class CScript;
enum isminetype enum isminetype
{ {
ISMINE_NO = 0, ISMINE_NO = 0,
//! Indicates that we dont know how to create a scriptSig that would solve this if we were given the appropriate private keys //! Indicates that we don't know how to create a scriptSig that would solve this if we were given the appropriate private keys
ISMINE_WATCH_UNSOLVABLE = 1, ISMINE_WATCH_UNSOLVABLE = 1,
//! Indicates that we know how to create a scriptSig that would solve this if we were given the appropriate private keys //! Indicates that we know how to create a scriptSig that would solve this if we were given the appropriate private keys
ISMINE_WATCH_SOLVABLE = 2, ISMINE_WATCH_SOLVABLE = 2,

Loading…
Cancel
Save