diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2014-12-31 08:00:37 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2014-12-31 08:00:37 -0500 |
| commit | 664999eb8749b3632ba96166320ed38d7d139ec4 (patch) | |
| tree | f7e61b6390c694fe16ff1fec66d0061a95d8fbae /src | |
| parent | ccef2b5f264062a33748d08cbde1e740019599d0 (diff) | |
| parent | 4f1ee565b5669fece4178d590f37a577c4062420 (diff) | |
Merge #5578 from
branch 'error_typos' of git://github.com/paveljanik/bitcoin into merge-5578
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index f6033566ef..5c0f0116d6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -927,11 +927,11 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa *pfMissingInputs = false; if (!CheckTransaction(tx, state)) - return error("AcceptToMemoryPool: : CheckTransaction failed"); + return error("AcceptToMemoryPool: CheckTransaction failed"); // Coinbase is only valid in a block, not as a loose transaction if (tx.IsCoinBase()) - return state.DoS(100, error("AcceptToMemoryPool: : coinbase as individual tx"), + return state.DoS(100, error("AcceptToMemoryPool: coinbase as individual tx"), REJECT_INVALID, "coinbase"); // Rather not work on nonstandard transactions (unless -testnet/-regtest) @@ -1001,7 +1001,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa // Check for non-standard pay-to-script-hash in inputs if (Params().RequireStandard() && !AreInputsStandard(tx, view)) - return error("AcceptToMemoryPool: : nonstandard transaction input"); + return error("AcceptToMemoryPool: nonstandard transaction input"); // Check that the transaction doesn't have an excessive number of // sigops, making it impossible to mine. Since the coinbase transaction @@ -1077,7 +1077,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa // can be exploited as a DoS attack. if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true)) { - return error("AcceptToMemoryPool: : BUG! PLEASE REPORT THIS! ConnectInputs failed against MANDATORY but not STANDARD flags %s", hash.ToString()); + return error("AcceptToMemoryPool: BUG! PLEASE REPORT THIS! ConnectInputs failed against MANDATORY but not STANDARD flags %s", hash.ToString()); } // Store transaction in memory |