Explorar el Código

Fix small typos in comments and error messages

Rebased-From: 67b2d819cd
Github-Pull: #5404
tags/v0.15.1
Pavel Janík hace 6 años
padre
commit
bf7835c271
No account linked to committer's email address
Se han modificado 5 ficheros con 9 adiciones y 9 borrados
  1. 1
    1
      src/chain.h
  2. 4
    4
      src/main.cpp
  3. 2
    2
      src/txmempool.cpp
  4. 1
    1
      src/uint256.cpp
  5. 1
    1
      src/wallet_ismine.cpp

+ 1
- 1
src/chain.h Ver fichero

@@ -95,7 +95,7 @@ enum BlockStatus {
class CBlockIndex
{
public:
//! pointer to the hash of the block, if any. memory is owned by this CBlockIndex
//! pointer to the hash of the block, if any. Memory is owned by this CBlockIndex
const uint256* phashBlock;

//! pointer to the index of the predecessor of this block

+ 4
- 4
src/main.cpp Ver fichero

@@ -1025,7 +1025,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
hash.ToString(), nFees, txMinFee),
REJECT_INSUFFICIENTFEE, "insufficient fee");

// Continuously rate-limit free (really, very-low-fee)transactions
// Continuously rate-limit free (really, very-low-fee) transactions
// This mitigates 'penny-flooding' -- sending thousands of free transactions just to
// be annoying or make others' transactions take longer to confirm.
if (fLimitFree && nFees < ::minRelayTxFee.GetFee(nSize))
@@ -1050,7 +1050,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
}

if (fRejectInsaneFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000)
return error("AcceptToMemoryPool: : insane fees %s, %d > %d",
return error("AcceptToMemoryPool: insane fees %s, %d > %d",
hash.ToString(),
nFees, ::minRelayTxFee.GetFee(nSize) * 10000);

@@ -1058,7 +1058,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
// This is done last to help prevent CPU exhaustion denial-of-service attacks.
if (!CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS, true))
{
return error("AcceptToMemoryPool: : ConnectInputs failed %s", hash.ToString());
return error("AcceptToMemoryPool: ConnectInputs failed %s", hash.ToString());
}
// Store transaction in memory
pool.addUnchecked(hash, entry);
@@ -2988,7 +2988,7 @@ bool InitBlockIndex() {
return error("LoadBlockIndex() : genesis block not accepted");
if (!ActivateBestChain(state, &block))
return error("LoadBlockIndex() : genesis block cannot be activated");
// Force a chainstate write so that when we VerifyDB in a moment, it doesnt check stale data
// Force a chainstate write so that when we VerifyDB in a moment, it doesn't check stale data
return FlushStateToDisk(state, FLUSH_STATE_ALWAYS);
} catch(std::runtime_error &e) {
return error("LoadBlockIndex() : failed to initialize block database: %s", e.what());

+ 2
- 2
src/txmempool.cpp Ver fichero

@@ -241,8 +241,8 @@ public:
}
}

//After new samples are added, we have to clear the sorted lists,
//so they'll be resorted the next time someone asks for an estimate
// After new samples are added, we have to clear the sorted lists,
// so they'll be resorted the next time someone asks for an estimate
sortedFeeSamples.clear();
sortedPrioritySamples.clear();


+ 1
- 1
src/uint256.cpp Ver fichero

@@ -99,7 +99,7 @@ base_uint<BITS>& base_uint<BITS>::operator/=(const base_uint& b)
if (div_bits > num_bits) // the result is certainly 0.
return *this;
int shift = num_bits - div_bits;
div <<= shift; // shift so that div and nun align.
div <<= shift; // shift so that div and num align.
while (shift >= 0) {
if (num >= div) {
num -= div;

+ 1
- 1
src/wallet_ismine.cpp Ver fichero

@@ -74,7 +74,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
case TX_MULTISIG:
{
// Only consider transactions "mine" if we own ALL the
// keys involved. multi-signature transactions that are
// keys involved. Multi-signature transactions that are
// partially owned (somebody else has a key that can spend
// them) enable spend-out-from-under-you attacks, especially
// in shared-wallet situations.

Cargando…
Cancelar
Guardar