Skip to content

Commit 0a5a6b9

Browse files
committed
Fixed multiple typos
A few "a->an" and "an->a". "Shows, if the supplied default SOCKS5 proxy" -> "Shows if the supplied default SOCKS5 proxy". Change made on 3 occurrences. "without fully understanding the ramification of a command" -> "without fully understanding the ramifications of a command". Removed duplicate words such as "the the".
1 parent c38f540 commit 0a5a6b9

33 files changed

+60
-60
lines changed

contrib/rpm/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,5 @@ knows what they are getting when installing the GUI package.
181181

182182
As far as minor differences, I generally prefer to assign the file permissions
183183
in the `%files` portion of an RPM spec file rather than specifying the
184-
permissions of a file during `%install` and other minor things like that that
184+
permissions of a file during `%install` and other minor things like that
185185
are largely just cosmetic.

contrib/rpm/bitcoin.if

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ interface(`bitcoin_manage_lib_dirs',`
121121
########################################
122122
## <summary>
123123
## All of the rules required to administrate
124-
## an bitcoin environment
124+
## a bitcoin environment
125125
## </summary>
126126
## <param name="domain">
127127
## <summary>

doc/developer-notes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ General C++
287287

288288
- Assertions should not have side-effects
289289

290-
- *Rationale*: Even though the source code is set to to refuse to compile
290+
- *Rationale*: Even though the source code is set to refuse to compile
291291
with assertions disabled, having side-effects in assertions is unexpected and
292292
makes the code harder to understand
293293

src/chain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ arith_uint256 GetBlockProof(const CBlockIndex& block)
126126
if (fNegative || fOverflow || bnTarget == 0)
127127
return 0;
128128
// We need to compute 2**256 / (bnTarget+1), but we can't represent 2**256
129-
// as it's too large for a arith_uint256. However, as 2**256 is at least as large
129+
// as it's too large for an arith_uint256. However, as 2**256 is at least as large
130130
// as bnTarget+1, it is equal to ((2**256 - bnTarget - 1) / (bnTarget+1)) + 1,
131131
// or ~bnTarget / (nTarget+1) + 1.
132132
return (~bnTarget / (bnTarget + 1)) + 1;

src/cuckoocache.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ class cache
176176
*/
177177
mutable std::vector<bool> epoch_flags;
178178

179-
/** epoch_heuristic_counter is used to determine when a epoch might be aged
179+
/** epoch_heuristic_counter is used to determine when an epoch might be aged
180180
* & an expensive scan should be done. epoch_heuristic_counter is
181181
* decremented on insert and reset to the new number of inserts which would
182182
* cause the epoch to reach epoch_size when it reaches zero.
183183
*/
184184
uint32_t epoch_heuristic_counter;
185185

186186
/** epoch_size is set to be the number of elements supposed to be in a
187-
* epoch. When the number of non-erased elements in a epoch
187+
* epoch. When the number of non-erased elements in an epoch
188188
* exceeds epoch_size, a new epoch should be started and all
189189
* current entries demoted. epoch_size is set to be 45% of size because
190190
* we want to keep load around 90%, and we support 3 epochs at once --

src/httpserver.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class HTTPRequest
8686

8787
/**
8888
* Get the request header specified by hdr, or an empty string.
89-
* Return an pair (isPresent,string).
89+
* Return a pair (isPresent,string).
9090
*/
9191
std::pair<bool, std::string> GetHeader(const std::string& hdr);
9292

@@ -125,7 +125,7 @@ class HTTPClosure
125125
virtual ~HTTPClosure() {}
126126
};
127127

128-
/** Event class. This can be used either as an cross-thread trigger or as a timer.
128+
/** Event class. This can be used either as a cross-thread trigger or as a timer.
129129
*/
130130
class HTTPEvent
131131
{

src/leveldb/db/version_set.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ class Compaction {
376376
// Each compaction reads inputs from "level_" and "level_+1"
377377
std::vector<FileMetaData*> inputs_[2]; // The two sets of inputs
378378

379-
// State used to check for number of of overlapping grandparent files
379+
// State used to check for number of overlapping grandparent files
380380
// (parent == level_ + 1, grandparent == level_ + 2)
381381
std::vector<FileMetaData*> grandparents_;
382382
size_t grandparent_index_; // Index in grandparent_starts_

src/policy/fees.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class TxConfirmStats;
4848
* in each bucket and the total amount of feerate paid in each bucket. Then we
4949
* calculate how many blocks Y it took each transaction to be mined. We convert
5050
* from a number of blocks to a number of periods Y' each encompassing "scale"
51-
* blocks. This is is tracked in 3 different data sets each up to a maximum
51+
* blocks. This is tracked in 3 different data sets each up to a maximum
5252
* number of periods. Within each data set we have an array of counters in each
5353
* feerate bucket and we increment all the counters from Y' up to max periods
5454
* representing that a tx was successfully confirmed in less than or equal to

src/qt/clientmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, const CB
303303
}
304304
// if we are in-sync, update the UI regardless of last update time
305305
if (!initialSync || now - nLastUpdateNotification > MODEL_UPDATE_DELAY) {
306-
//pass a async signal to the UI thread
306+
//pass an async signal to the UI thread
307307
QMetaObject::invokeMethod(clientmodel, "numBlocksChanged", Qt::QueuedConnection,
308308
Q_ARG(int, pIndex->nHeight),
309309
Q_ARG(QDateTime, QDateTime::fromTime_t(pIndex->GetBlockTime())),

src/qt/coincontroldialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
499499
{
500500
// there is some fudging in these numbers related to the actual virtual transaction size calculation that will keep this estimate from being exact.
501501
// usually, the result will be an overestimate within a couple of satoshis so that the confirmation dialog ends up displaying a slightly smaller fee.
502-
// also, the witness stack size value value is a variable sized integer. usually, the number of stack items will be well under the single byte var int limit.
502+
// also, the witness stack size value is a variable sized integer. usually, the number of stack items will be well under the single byte var int limit.
503503
nBytes += 2; // account for the serialized marker and flag bytes
504504
nBytes += nQuantity; // account for the witness byte that holds the number of stack items for each input.
505505
}

src/qt/forms/optionsdialog.ui

+3-3
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
<bool>false</bool>
316316
</property>
317317
<property name="toolTip">
318-
<string>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
318+
<string>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
319319
</property>
320320
<property name="text">
321321
<string/>
@@ -338,7 +338,7 @@
338338
<bool>false</bool>
339339
</property>
340340
<property name="toolTip">
341-
<string>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
341+
<string>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
342342
</property>
343343
<property name="text">
344344
<string/>
@@ -361,7 +361,7 @@
361361
<bool>false</bool>
362362
</property>
363363
<property name="toolTip">
364-
<string>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
364+
<string>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
365365
</property>
366366
<property name="text">
367367
<string/>

src/qt/modaloverlay.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
126126
return;
127127

128128
// estimate the number of headers left based on nPowTargetSpacing
129-
// and check if the gui is not aware of the the best header (happens rarely)
129+
// and check if the gui is not aware of the best header (happens rarely)
130130
int estimateNumHeadersLeft = bestHeaderDate.secsTo(currentDate) / Params().GetConsensus().nPowTargetSpacing;
131131
bool hasBestHeader = bestHeaderHeight >= count;
132132

src/qt/rpcconsole.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ void RPCConsole::setFontSize(int newSize)
672672
{
673673
QSettings settings;
674674

675-
//don't allow a insane font size
675+
//don't allow an insane font size
676676
if (newSize < FONT_RANGE.width() || newSize > FONT_RANGE.height())
677677
return;
678678

@@ -738,7 +738,7 @@ void RPCConsole::clear(bool clearHistory)
738738
tr("Use up and down arrows to navigate history, and %1 to clear screen.").arg("<b>"+clsKey+"</b>") + "<br>" +
739739
tr("Type <b>help</b> for an overview of available commands.")) +
740740
"<br><span class=\"secwarning\">" +
741-
tr("WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.") +
741+
tr("WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.") +
742742
"</span>",
743743
true);
744744
}

src/qt/walletmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
339339
transaction_array.append(&(ssTx[0]), ssTx.size());
340340
}
341341

342-
// Add addresses / update labels that we've sent to to the address book,
342+
// Add addresses / update labels that we've sent to the address book,
343343
// and emit coinsSent signal for each recipient
344344
for (const SendCoinsRecipient &rcp : transaction.getRecipients())
345345
{

src/rest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
413413
boost::split(uriParts, strUriParams, boost::is_any_of("/"));
414414
}
415415

416-
// throw exception in case of a empty request
416+
// throw exception in case of an empty request
417417
std::string strRequestMutable = req->ReadBody();
418418
if (strRequestMutable.length() == 0 && uriParts.size() == 0)
419419
return RESTERR(req, HTTP_BAD_REQUEST, "Error: empty request");

src/rpc/net.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
7575
"[\n"
7676
" {\n"
7777
" \"id\": n, (numeric) Peer index\n"
78-
" \"addr\":\"host:port\", (string) The ip address and port of the peer\n"
78+
" \"addr\":\"host:port\", (string) The IP address and port of the peer\n"
7979
" \"addrbind\":\"ip:port\", (string) Bind address of the connection to the peer\n"
8080
" \"addrlocal\":\"ip:port\", (string) Local address as reported by the peer\n"
8181
" \"services\":\"xxxxxxxxxxxxxxxx\", (string) The services offered\n"
@@ -199,7 +199,7 @@ UniValue addnode(const JSONRPCRequest& request)
199199
(strCommand != "onetry" && strCommand != "add" && strCommand != "remove"))
200200
throw std::runtime_error(
201201
"addnode \"node\" \"add|remove|onetry\"\n"
202-
"\nAttempts add or remove a node from the addnode list.\n"
202+
"\nAttempts to add or remove a node from the addnode list.\n"
203203
"Or try a connection to a node once.\n"
204204
"\nArguments:\n"
205205
"1. \"node\" (string, required) The node (see getpeerinfo for nodes)\n"
@@ -290,7 +290,7 @@ UniValue getaddednodeinfo(const JSONRPCRequest& request)
290290
"\nResult:\n"
291291
"[\n"
292292
" {\n"
293-
" \"addednode\" : \"192.168.0.201\", (string) The node ip address or name (as provided to addnode)\n"
293+
" \"addednode\" : \"192.168.0.201\", (string) The node IP address or name (as provided to addnode)\n"
294294
" \"connected\" : true|false, (boolean) If connected\n"
295295
" \"addresses\" : [ (list of objects) Only when connected = true\n"
296296
" {\n"
@@ -497,12 +497,12 @@ UniValue setban(const JSONRPCRequest& request)
497497
(strCommand != "add" && strCommand != "remove"))
498498
throw std::runtime_error(
499499
"setban \"subnet\" \"add|remove\" (bantime) (absolute)\n"
500-
"\nAttempts add or remove a IP/Subnet from the banned list.\n"
500+
"\nAttempts to add or remove an IP/Subnet from the banned list.\n"
501501
"\nArguments:\n"
502-
"1. \"subnet\" (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n"
503-
"2. \"command\" (string, required) 'add' to add a IP/Subnet to the list, 'remove' to remove a IP/Subnet from the list\n"
504-
"3. \"bantime\" (numeric, optional) time in seconds how long (or until when if [absolute] is set) the ip is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)\n"
505-
"4. \"absolute\" (boolean, optional) If set, the bantime must be a absolute timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
502+
"1. \"subnet\" (string, required) The IP/Subnet (see getpeerinfo for nodes IP) with an optional netmask (default is /32 = single IP)\n"
503+
"2. \"command\" (string, required) 'add' to add an IP/Subnet to the list, 'remove' to remove an IP/Subnet from the list\n"
504+
"3. \"bantime\" (numeric, optional) time in seconds how long (or until when if [absolute] is set) the IP is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)\n"
505+
"4. \"absolute\" (boolean, optional) If set, the bantime must be an absolute timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
506506
"\nExamples:\n"
507507
+ HelpExampleCli("setban", "\"192.168.0.6\" \"add\" 86400")
508508
+ HelpExampleCli("setban", "\"192.168.0.0/24\" \"add\"")

src/secp256k1/sage/group_prover.sage

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# to independently set assumptions on input or intermediary variables.
44
#
55
# The general approach is:
6-
# * A constraint is a tuple of two sets of of symbolic expressions:
6+
# * A constraint is a tuple of two sets of symbolic expressions:
77
# the first of which are required to evaluate to zero, the second of which
88
# are required to evaluate to nonzero.
99
# - A constraint is said to be conflicting if any of its nonzero expressions

src/secp256k1/src/asm/field_10x26_arm.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Note:
1111

1212
- To avoid unnecessary loads and make use of available registers, two
1313
'passes' have every time been interleaved, with the odd passes accumulating c' and d'
14-
which will be added to c and d respectively in the the even passes
14+
which will be added to c and d respectively in the even passes
1515

1616
*/
1717

src/test/arith_uint256_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE( unaryOperators ) // ! ~ -
219219

220220

221221
// Check if doing _A_ _OP_ _B_ results in the same as applying _OP_ onto each
222-
// element of Aarray and Barray, and then converting the result into a arith_uint256.
222+
// element of Aarray and Barray, and then converting the result into an arith_uint256.
223223
#define CHECKBITWISEOPERATOR(_A_,_B_,_OP_) \
224224
for (unsigned int i = 0; i < 32; ++i) { TmpArray[i] = _A_##Array[i] _OP_ _B_##Array[i]; } \
225225
BOOST_CHECK(arith_uint256V(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (_A_##L _OP_ _B_##L));

src/test/data/script_tests.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2506,7 +2506,7 @@
25062506
],
25072507

25082508
["CHECKSEQUENCEVERIFY tests"],
2509-
["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a empty stack"],
2509+
["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on an empty stack"],
25102510
["-1", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "NEGATIVE_LOCKTIME", "CSV automatically fails if stack top is negative"],
25112511
["0x0100", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY,MINIMALDATA", "UNKNOWN_ERROR", "CSV fails if stack top is not minimally encoded"],
25122512
["0", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is set and the tx version < 2"],

src/test/data/tx_valid.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
[[["5a6b0021a6042a686b6b94abc36b387bef9109847774e8b1e51eb8cc55c53921", 1, "DUP HASH160 0x14 0xee5a6aa40facefb2655ac23c0c28c57c65c41f9b EQUALVERIFY CHECKSIG"]],
175175
"01000000012139c555ccb81ee5b1e87477840991ef7b386bc3ab946b6b682a04a621006b5a01000000fdb40148304502201723e692e5f409a7151db386291b63524c5eb2030df652b1f53022fd8207349f022100b90d9bbf2f3366ce176e5e780a00433da67d9e5c79312c6388312a296a5800390148304502201723e692e5f409a7151db386291b63524c5eb2030df652b1f53022fd8207349f022100b90d9bbf2f3366ce176e5e780a00433da67d9e5c79312c6388312a296a5800390121038479a0fa998cd35259a2ef0a7a5c68662c1474f88ccb6d08a7677bbec7f2204148304502201723e692e5f409a7151db386291b63524c5eb2030df652b1f53022fd8207349f022100b90d9bbf2f3366ce176e5e780a00433da67d9e5c79312c6388312a296a5800390175ac4830450220646b72c35beeec51f4d5bc1cbae01863825750d7f490864af354e6ea4f625e9c022100f04b98432df3a9641719dbced53393022e7249fb59db993af1118539830aab870148304502201723e692e5f409a7151db386291b63524c5eb2030df652b1f53022fd8207349f022100b90d9bbf2f3366ce176e5e780a00433da67d9e5c79312c6388312a296a580039017521038479a0fa998cd35259a2ef0a7a5c68662c1474f88ccb6d08a7677bbec7f22041ffffffff010000000000000000016a00000000", "P2SH"],
176176

177-
["Finally CHECKMULTISIG removes all signatures prior to hashing the script containing those signatures. In conjunction with the SIGHASH_SINGLE bug this lets us test whether or not FindAndDelete() is actually present in scriptPubKey/redeemScript evaluation by including a signature of the digest 0x01 We can compute in advance for our pubkey, embed it it in the scriptPubKey, and then also using a normal SIGHASH_ALL signature. If FindAndDelete() wasn't run, the 'bugged' signature would still be in the hashed script, and the normal signature would fail."],
177+
["Finally CHECKMULTISIG removes all signatures prior to hashing the script containing those signatures. In conjunction with the SIGHASH_SINGLE bug this lets us test whether or not FindAndDelete() is actually present in scriptPubKey/redeemScript evaluation by including a signature of the digest 0x01 We can compute in advance for our pubkey, embed it in the scriptPubKey, and then also using a normal SIGHASH_ALL signature. If FindAndDelete() wasn't run, the 'bugged' signature would still be in the hashed script, and the normal signature would fail."],
178178

179179
["Here's an example on mainnet within a P2SH redeemScript. Remarkably it's a standard transaction in <0.9"],
180180
[[["b5b598de91787439afd5938116654e0b16b7a0d0f82742ba37564219c5afcbf9", 0, "DUP HASH160 0x14 0xf6f365c40f0739b61de827a44751e5e99032ed8f EQUALVERIFY CHECKSIG"],

src/torcontrol.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ static bool WriteBinaryFile(const fs::path &filename, const std::string &data)
407407
/****** Bitcoin specific TorController implementation ********/
408408

409409
/** Controller that connects to Tor control socket, authenticate, then create
410-
* and maintain a ephemeral hidden service.
410+
* and maintain an ephemeral hidden service.
411411
*/
412412
class TorController
413413
{

src/txmempool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashes
122122
// accounted for in the state of their ancestors)
123123
std::set<uint256> setAlreadyIncluded(vHashesToUpdate.begin(), vHashesToUpdate.end());
124124

125-
// Iterate in reverse, so that whenever we are looking at at a transaction
125+
// Iterate in reverse, so that whenever we are looking at a transaction
126126
// we are sure that all in-mempool descendants have already been processed.
127127
// This maximizes the benefit of the descendant cache and guarantees that
128128
// setMemPoolChildren will be updated, an assumption made in

0 commit comments

Comments
 (0)