Merge #9510: [trivial] Fix typos in comments
cc16d99
[trivial] Fix typos in comments (practicalswift)
This commit is contained in:
commit
0fea960ca9
21 changed files with 24 additions and 24 deletions
|
@ -24,7 +24,7 @@ input=/home/example/.bitcoin/blocks
|
||||||
output_file=/home/example/Downloads/bootstrap.dat
|
output_file=/home/example/Downloads/bootstrap.dat
|
||||||
hashlist=hashlist.txt
|
hashlist=hashlist.txt
|
||||||
|
|
||||||
# Maxmimum size in bytes of out-of-order blocks cache in memory
|
# Maximum size in bytes of out-of-order blocks cache in memory
|
||||||
out_of_order_cache_sz = 100000000
|
out_of_order_cache_sz = 100000000
|
||||||
|
|
||||||
# Do we want the reverse the hash bytes coming from getblockhash?
|
# Do we want the reverse the hash bytes coming from getblockhash?
|
||||||
|
|
|
@ -255,7 +255,7 @@ bool CAddrMan::Add_(const CAddress& addr, const CNetAddr& source, int64_t nTimeP
|
||||||
int nId;
|
int nId;
|
||||||
CAddrInfo* pinfo = Find(addr, &nId);
|
CAddrInfo* pinfo = Find(addr, &nId);
|
||||||
|
|
||||||
// Do not set a penality for a source's self-announcement
|
// Do not set a penalty for a source's self-announcement
|
||||||
if (addr == source) {
|
if (addr == source) {
|
||||||
nTimePenalty = 0;
|
nTimePenalty = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,7 +147,7 @@ public:
|
||||||
K GetKey() {
|
K GetKey() {
|
||||||
K ret;
|
K ret;
|
||||||
if (vchData.size() == Size) {
|
if (vchData.size() == Size) {
|
||||||
//if base58 encouded data not holds a ext key, return a !IsValid() key
|
// If base58 encoded data does not hold an ext key, return a !IsValid() key
|
||||||
ret.Decode(&vchData[0]);
|
ret.Decode(&vchData[0]);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#if defined(__i386__) || defined(__x86_64__)
|
#if defined(__i386__) || defined(__x86_64__)
|
||||||
|
|
||||||
/* These architectures support quering the cycle counter
|
/* These architectures support querying the cycle counter
|
||||||
* from user space, no need for any syscall overhead.
|
* from user space, no need for any syscall overhead.
|
||||||
*/
|
*/
|
||||||
void perf_init(void) { }
|
void perf_init(void) { }
|
||||||
|
|
|
@ -99,7 +99,7 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownlaodedBlock
|
// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownloadedBlock
|
||||||
struct PrefilledTransaction {
|
struct PrefilledTransaction {
|
||||||
// Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
|
// Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
|
||||||
// as a proper transaction-in-block-index in PartiallyDownloadedBlock
|
// as a proper transaction-in-block-index in PartiallyDownloadedBlock
|
||||||
|
|
|
@ -47,7 +47,7 @@ struct Params {
|
||||||
/** Block height at which BIP66 becomes active */
|
/** Block height at which BIP66 becomes active */
|
||||||
int BIP66Height;
|
int BIP66Height;
|
||||||
/**
|
/**
|
||||||
* Minimum blocks including miner confirmation of the total of 2016 blocks in a retargetting period,
|
* Minimum blocks including miner confirmation of the total of 2016 blocks in a retargeting period,
|
||||||
* (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments.
|
* (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments.
|
||||||
* Examples: 1916 for 95%, 1512 for testchains.
|
* Examples: 1916 for 95%, 1512 for testchains.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -257,7 +257,7 @@ private:
|
||||||
*
|
*
|
||||||
* First, epoch_check decrements and checks the cheap heuristic, and then does
|
* First, epoch_check decrements and checks the cheap heuristic, and then does
|
||||||
* a more expensive scan if the cheap heuristic runs out. If the expensive
|
* a more expensive scan if the cheap heuristic runs out. If the expensive
|
||||||
* scan suceeds, the epochs are aged and old elements are allow_erased. The
|
* scan succeeds, the epochs are aged and old elements are allow_erased. The
|
||||||
* cheap heuristic is reset to retrigger after the worst case growth of the
|
* cheap heuristic is reset to retrigger after the worst case growth of the
|
||||||
* current epoch's elements would exceed the epoch_size.
|
* current epoch's elements would exceed the epoch_size.
|
||||||
*/
|
*/
|
||||||
|
@ -395,7 +395,7 @@ public:
|
||||||
* 1) On first iteration, last_loc == invalid(), find returns last, so
|
* 1) On first iteration, last_loc == invalid(), find returns last, so
|
||||||
* last_loc defaults to locs[0].
|
* last_loc defaults to locs[0].
|
||||||
* 2) On further iterations, where last_loc == locs[k], last_loc will
|
* 2) On further iterations, where last_loc == locs[k], last_loc will
|
||||||
* go to locs[k+1 % 8], i.e., next of the 8 indicies wrapping around
|
* go to locs[k+1 % 8], i.e., next of the 8 indices wrapping around
|
||||||
* to 0 if needed.
|
* to 0 if needed.
|
||||||
*
|
*
|
||||||
* This prevents moving the element we just put in.
|
* This prevents moving the element we just put in.
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
|
static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
|
||||||
|
|
||||||
/** Simple one-shot callback timer to be used by the RPC mechanism to e.g.
|
/** Simple one-shot callback timer to be used by the RPC mechanism to e.g.
|
||||||
* re-lock the wellet.
|
* re-lock the wallet.
|
||||||
*/
|
*/
|
||||||
class HTTPRPCTimer : public RPCTimerBase
|
class HTTPRPCTimer : public RPCTimerBase
|
||||||
{
|
{
|
||||||
|
|
|
@ -1553,7 +1553,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
|
if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
|
||||||
// Only advertize witness capabilities if they have a reasonable start time.
|
// Only advertise witness capabilities if they have a reasonable start time.
|
||||||
// This allows us to have the code merged without a defined softfork, by setting its
|
// This allows us to have the code merged without a defined softfork, by setting its
|
||||||
// end time to 0.
|
// end time to 0.
|
||||||
// Note that setting NODE_WITNESS is never required: the only downside from not
|
// Note that setting NODE_WITNESS is never required: the only downside from not
|
||||||
|
|
|
@ -49,7 +49,7 @@ class CNetAddr
|
||||||
bool IsIPv4() const; // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
|
bool IsIPv4() const; // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
|
||||||
bool IsIPv6() const; // IPv6 address (not mapped IPv4, not Tor)
|
bool IsIPv6() const; // IPv6 address (not mapped IPv4, not Tor)
|
||||||
bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
|
bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
|
||||||
bool IsRFC2544() const; // IPv4 inter-network communcations (192.18.0.0/15)
|
bool IsRFC2544() const; // IPv4 inter-network communications (192.18.0.0/15)
|
||||||
bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10)
|
bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10)
|
||||||
bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24)
|
bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24)
|
||||||
bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32)
|
bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32)
|
||||||
|
|
|
@ -64,7 +64,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sortColumn >= 0)
|
if (sortColumn >= 0)
|
||||||
// sort cachedBanlist (use stable sort to prevent rows jumping around unneceesarily)
|
// sort cachedBanlist (use stable sort to prevent rows jumping around unnecessarily)
|
||||||
qStableSort(cachedBanlist.begin(), cachedBanlist.end(), BannedNodeLessThan(sortColumn, sortOrder));
|
qStableSort(cachedBanlist.begin(), cachedBanlist.end(), BannedNodeLessThan(sortColumn, sortOrder));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,10 +21,10 @@
|
||||||
//
|
//
|
||||||
// When startup is finished and the main window is
|
// When startup is finished and the main window is
|
||||||
// shown, a signal is sent to slot uiReady(), which
|
// shown, a signal is sent to slot uiReady(), which
|
||||||
// emits a receivedURL() signal for any payment
|
// emits a receivedURI() signal for any payment
|
||||||
// requests that happened during startup.
|
// requests that happened during startup.
|
||||||
//
|
//
|
||||||
// After startup, receivedURL() happens as usual.
|
// After startup, receivedURI() happens as usual.
|
||||||
//
|
//
|
||||||
// This class has one more feature: a static
|
// This class has one more feature: a static
|
||||||
// method that finds URIs passed in the command line
|
// method that finds URIs passed in the command line
|
||||||
|
|
|
@ -608,7 +608,7 @@ void SendCoinsDialog::updateGlobalFeeVariables()
|
||||||
// set nMinimumTotalFee to 0 to not accidentally pay a custom fee
|
// set nMinimumTotalFee to 0 to not accidentally pay a custom fee
|
||||||
CoinControlDialog::coinControl->nMinimumTotalFee = 0;
|
CoinControlDialog::coinControl->nMinimumTotalFee = 0;
|
||||||
|
|
||||||
// show the estimated reuquired time for confirmation
|
// show the estimated required time for confirmation
|
||||||
ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget * Params().GetConsensus().nPowTargetSpacing) + " / " + tr("%n block(s)", "", nConfirmTarget));
|
ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget * Params().GetConsensus().nPowTargetSpacing) + " / " + tr("%n block(s)", "", nConfirmTarget));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -39,7 +39,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
|
||||||
|
|
||||||
QString version = tr(PACKAGE_NAME) + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion());
|
QString version = tr(PACKAGE_NAME) + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion());
|
||||||
/* On x86 add a bit specifier to the version so that users can distinguish between
|
/* On x86 add a bit specifier to the version so that users can distinguish between
|
||||||
* 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious.
|
* 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambiguous.
|
||||||
*/
|
*/
|
||||||
#if defined(__x86_64__)
|
#if defined(__x86_64__)
|
||||||
version += " " + tr("(%1-bit)").arg(64);
|
version += " " + tr("(%1-bit)").arg(64);
|
||||||
|
|
|
@ -150,7 +150,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
|
||||||
obj.push_back(Pair("pingwait", stats.dPingWait));
|
obj.push_back(Pair("pingwait", stats.dPingWait));
|
||||||
obj.push_back(Pair("version", stats.nVersion));
|
obj.push_back(Pair("version", stats.nVersion));
|
||||||
// Use the sanitized form of subver here, to avoid tricksy remote peers from
|
// Use the sanitized form of subver here, to avoid tricksy remote peers from
|
||||||
// corrupting or modifiying the JSON output by putting special characters in
|
// corrupting or modifying the JSON output by putting special characters in
|
||||||
// their ver message.
|
// their ver message.
|
||||||
obj.push_back(Pair("subver", stats.cleanSubVer));
|
obj.push_back(Pair("subver", stats.cleanSubVer));
|
||||||
obj.push_back(Pair("inbound", stats.fInbound));
|
obj.push_back(Pair("inbound", stats.fInbound));
|
||||||
|
|
|
@ -129,7 +129,7 @@ const char* GetOpName(opcodetype opcode)
|
||||||
case OP_CHECKMULTISIG : return "OP_CHECKMULTISIG";
|
case OP_CHECKMULTISIG : return "OP_CHECKMULTISIG";
|
||||||
case OP_CHECKMULTISIGVERIFY : return "OP_CHECKMULTISIGVERIFY";
|
case OP_CHECKMULTISIGVERIFY : return "OP_CHECKMULTISIGVERIFY";
|
||||||
|
|
||||||
// expanson
|
// expansion
|
||||||
case OP_NOP1 : return "OP_NOP1";
|
case OP_NOP1 : return "OP_NOP1";
|
||||||
case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY";
|
case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY";
|
||||||
case OP_CHECKSEQUENCEVERIFY : return "OP_CHECKSEQUENCEVERIFY";
|
case OP_CHECKSEQUENCEVERIFY : return "OP_CHECKSEQUENCEVERIFY";
|
||||||
|
|
|
@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(sizes)
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(floats_conversion)
|
BOOST_AUTO_TEST_CASE(floats_conversion)
|
||||||
{
|
{
|
||||||
// Choose values that map unambigiously to binary floating point to avoid
|
// Choose values that map unambiguously to binary floating point to avoid
|
||||||
// rounding issues at the compiler side.
|
// rounding issues at the compiler side.
|
||||||
BOOST_CHECK_EQUAL(ser_uint32_to_float(0x00000000), 0.0F);
|
BOOST_CHECK_EQUAL(ser_uint32_to_float(0x00000000), 0.0F);
|
||||||
BOOST_CHECK_EQUAL(ser_uint32_to_float(0x3f000000), 0.5F);
|
BOOST_CHECK_EQUAL(ser_uint32_to_float(0x3f000000), 0.5F);
|
||||||
|
@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(floats_conversion)
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(doubles_conversion)
|
BOOST_AUTO_TEST_CASE(doubles_conversion)
|
||||||
{
|
{
|
||||||
// Choose values that map unambigiously to binary floating point to avoid
|
// Choose values that map unambiguously to binary floating point to avoid
|
||||||
// rounding issues at the compiler side.
|
// rounding issues at the compiler side.
|
||||||
BOOST_CHECK_EQUAL(ser_uint64_to_double(0x0000000000000000ULL), 0.0);
|
BOOST_CHECK_EQUAL(ser_uint64_to_double(0x0000000000000000ULL), 0.0);
|
||||||
BOOST_CHECK_EQUAL(ser_uint64_to_double(0x3fe0000000000000ULL), 0.5);
|
BOOST_CHECK_EQUAL(ser_uint64_to_double(0x3fe0000000000000ULL), 0.5);
|
||||||
|
|
|
@ -372,7 +372,7 @@ private:
|
||||||
struct event *reconnect_ev;
|
struct event *reconnect_ev;
|
||||||
float reconnect_timeout;
|
float reconnect_timeout;
|
||||||
CService service;
|
CService service;
|
||||||
/** Cooie for SAFECOOKIE auth */
|
/** Cookie for SAFECOOKIE auth */
|
||||||
std::vector<uint8_t> cookie;
|
std::vector<uint8_t> cookie;
|
||||||
/** ClientNonce for SAFECOOKIE auth */
|
/** ClientNonce for SAFECOOKIE auth */
|
||||||
std::vector<uint8_t> clientNonce;
|
std::vector<uint8_t> clientNonce;
|
||||||
|
|
|
@ -355,7 +355,7 @@ enum class MemPoolRemovalReason {
|
||||||
* Transactions are added when they are seen on the network (or created by the
|
* Transactions are added when they are seen on the network (or created by the
|
||||||
* local node), but not all transactions seen are added to the pool. For
|
* local node), but not all transactions seen are added to the pool. For
|
||||||
* example, the following new transactions will not be added to the mempool:
|
* example, the following new transactions will not be added to the mempool:
|
||||||
* - a transaction which doesn't make the mimimum fee requirements.
|
* - a transaction which doesn't meet the minimum fee requirements.
|
||||||
* - a new transaction that double-spends an input of a transaction already in
|
* - a new transaction that double-spends an input of a transaction already in
|
||||||
* the pool where the new transaction does not meet the Replace-By-Fee
|
* the pool where the new transaction does not meet the Replace-By-Fee
|
||||||
* requirements as defined in BIP 125.
|
* requirements as defined in BIP 125.
|
||||||
|
|
|
@ -63,7 +63,7 @@ void MilliSleep(int64_t n)
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Boost's sleep_for was uninterruptable when backed by nanosleep from 1.50
|
* Boost's sleep_for was uninterruptible when backed by nanosleep from 1.50
|
||||||
* until fixed in 1.52. Use the deprecated sleep method for the broken case.
|
* until fixed in 1.52. Use the deprecated sleep method for the broken case.
|
||||||
* See: https://svn.boost.org/trac/boost/ticket/7238
|
* See: https://svn.boost.org/trac/boost/ticket/7238
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -2576,7 +2576,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
|
||||||
// BIP125 defines opt-in RBF as any nSequence < maxint-1, so
|
// BIP125 defines opt-in RBF as any nSequence < maxint-1, so
|
||||||
// we use the highest possible value in that range (maxint-2)
|
// we use the highest possible value in that range (maxint-2)
|
||||||
// to avoid conflicting with other possible uses of nSequence,
|
// to avoid conflicting with other possible uses of nSequence,
|
||||||
// and in the spirit of "smallest posible change from prior
|
// and in the spirit of "smallest possible change from prior
|
||||||
// behavior."
|
// behavior."
|
||||||
for (const auto& coin : setCoins)
|
for (const auto& coin : setCoins)
|
||||||
txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(),
|
txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(),
|
||||||
|
|
Loading…
Reference in a new issue