Skip to content

Commit 4fb2586

Browse files
author
MarcoFalke
committed
Merge #10956: Fix typos
9d5e98f Fix typos. (practicalswift) Pull request description: Fix some typos not covered by #10705. Tree-SHA512: f06e9541f6ae13ef5d6731399b61795997b21a8816abeb1749c93e99a5c47354e6cbd4a3d145f4dc6ef8a13db179799a3121ecbb7288abf3e8d81cdf81500d37
2 parents d7be7b3 + 9d5e98f commit 4fb2586

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

contrib/linearize/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ linearize-hashes.py.
4646
(Default: `1000*1000*1000 bytes`)
4747
* `netmagic`: Network magic number.
4848
* `out_of_order_cache_sz`: If out-of-order blocks are being read, the block can
49-
be written to a cache so that the blockchain doesn't have to be seeked again.
49+
be written to a cache so that the blockchain doesn't have to be sought again.
5050
This option specifies the cache size. (Default: `100*1000*1000 bytes`)
5151
* `rev_hash_bytes`: If true, the block hash list written by linearize-hashes.py
5252
will be byte-reversed when read by linearize-data.py. See the linearize-hashes

src/chain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class CBlockIndex
216216
//! (memory only) Sequential id assigned to distinguish order in which blocks are received.
217217
int32_t nSequenceId;
218218

219-
//! (memory only) Maximum nTime in the chain upto and including this block.
219+
//! (memory only) Maximum nTime in the chain up to and including this block.
220220
unsigned int nTimeMax;
221221

222222
void SetNull()

src/qt/test/rpcnestedtests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void RPCNestedTests::rpcNestedTests()
7575
(RPCConsole::RPCExecuteCommandLine(result, "createrawtransaction [] {} 0")); //parameter not in brackets are allowed
7676
(RPCConsole::RPCExecuteCommandLine(result2, "createrawtransaction([],{},0)")); //parameter in brackets are allowed
7777
QVERIFY(result == result2);
78-
(RPCConsole::RPCExecuteCommandLine(result2, "createrawtransaction( [], {} , 0 )")); //whitespace between parametres is allowed
78+
(RPCConsole::RPCExecuteCommandLine(result2, "createrawtransaction( [], {} , 0 )")); //whitespace between parameters is allowed
7979
QVERIFY(result == result2);
8080

8181
RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())[tx][0]", &filtered);

src/wallet/rpcwallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ class Witnessifier : public boost::static_visitor<bool>
11341134
SignatureData sigs;
11351135
// This check is to make sure that the script we created can actually be solved for and signed by us
11361136
// if we were to have the private keys. This is just to make sure that the script is valid and that,
1137-
// if found in a transaction, we would still accept and relay that transcation.
1137+
// if found in a transaction, we would still accept and relay that transaction.
11381138
if (!ProduceSignature(DummySignatureCreator(pwallet), witscript, sigs) ||
11391139
!VerifyScript(sigs.scriptSig, witscript, &sigs.scriptWitness, MANDATORY_SCRIPT_VERIFY_FLAGS | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, DummySignatureCreator(pwallet).Checker())) {
11401140
return false;
@@ -1159,7 +1159,7 @@ class Witnessifier : public boost::static_visitor<bool>
11591159
SignatureData sigs;
11601160
// This check is to make sure that the script we created can actually be solved for and signed by us
11611161
// if we were to have the private keys. This is just to make sure that the script is valid and that,
1162-
// if found in a transaction, we would still accept and relay that transcation.
1162+
// if found in a transaction, we would still accept and relay that transaction.
11631163
if (!ProduceSignature(DummySignatureCreator(pwallet), witscript, sigs) ||
11641164
!VerifyScript(sigs.scriptSig, witscript, &sigs.scriptWitness, MANDATORY_SCRIPT_VERIFY_FLAGS | SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, DummySignatureCreator(pwallet).Checker())) {
11651165
return false;

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2571,7 +2571,7 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
25712571

25722572
if (nChangePosInOut != -1) {
25732573
tx.vout.insert(tx.vout.begin() + nChangePosInOut, wtx.tx->vout[nChangePosInOut]);
2574-
// we dont have the normal Create/Commit cycle, and dont want to risk reusing change,
2574+
// we don't have the normal Create/Commit cycle, and don't want to risk reusing change,
25752575
// so just remove the key from the keypool here.
25762576
reservekey.KeepKey();
25772577
}

test/functional/rawtransactions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) 2014-2016 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
5-
"""Test the rawtranscation RPCs.
5+
"""Test the rawtransaction RPCs.
66
77
Test the following RPCs:
88
- createrawtransaction

0 commit comments

Comments
 (0)