Skip to content

Commit 0886042

Browse files
committed
Merge #18253: doc: Correct spelling errors in comments
9b0e162 doc: Correct spelling errors in comments (Ben Woosley) Pull request description: And ci script output. Identified via test/lint/lint-spelling Before: ``` $ test/lint/lint-spelling.sh ci/test/05_before_script.sh:29: explicitely ==> explicitly src/compressor.h:43: Ser ==> Set src/compressor.h:78: Ser ==> Set src/logging/timer.h:88: outputing ==> outputting src/node/psbt.cpp:87: minumum ==> minimum src/qt/coincontroldialog.cpp:372: UnSelect ==> deselect src/qt/coincontroldialog.cpp:443: unselect ==> deselect src/qt/coincontroldialog.cpp:448: UnSelect ==> deselect src/qt/coincontroldialog.cpp:699: UnSelect ==> deselect src/serialize.h:211: Ser ==> Set src/serialize.h:213: Ser ==> Set src/serialize.h:228: Ser ==> Set src/serialize.h:246: Ser ==> Set src/serialize.h:484: Ser ==> Set src/serialize.h:490: Ser ==> Set src/serialize.h:510: Ser ==> Set src/serialize.h:622: Ser ==> Set src/serialize.h:740: Ser ==> Set src/test/base32_tests.cpp:14: fo ==> of, for src/test/base64_tests.cpp:14: fo ==> of, for src/txmempool.h:756: incomaptible ==> incompatible src/undo.h:26: Ser ==> Set src/wallet/coincontrol.h:74: UnSelect ==> deselect test/functional/feature_backwards_compatibility.py:116: Abondon ==> Abandon test/functional/rpc_getaddressinfo_label_deprecation.py:7: superceded ==> superseded test/lint/lint-shell.sh:44: desriptor ==> descriptor ^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in test/lint/lint-spelling.ignore-words.txt ``` After: ``` $ test/lint/lint-spelling.sh src/test/base32_tests.cpp:14: fo ==> of, for src/test/base64_tests.cpp:14: fo ==> of, for test/functional/rpc_getaddressinfo_label_deprecation.py:7: superceded ==> superseded ^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in test/lint/lint-spelling.ignore-words.txt ``` ACKs for top commit: practicalswift: ACK 9b0e162 MarcoFalke: ACK 9b0e162 Tree-SHA512: 9ce203700b11596e4b920b3c5b04f59bc7784fe5b495868d43423608180a9a553ec7efcc5ad70384f3ce462b036c2a682260efebce493c5e6a3d48716b268179
2 parents ac5c5d0 + 9b0e162 commit 0886042

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

ci/test/05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [[ $HOST = *-mingw32 ]]; then
2626
fi
2727
if [ -z "$NO_DEPENDS" ]; then
2828
if [[ $DOCKER_NAME_TAG == centos* ]]; then
29-
# CentOS has problems building the depends if the config shell is not explicitely set
29+
# CentOS has problems building the depends if the config shell is not explicitly set
3030
# (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
3131
# an error as the first command is executed)
3232
SHELL_OPTS="CONFIG_SHELL=/bin/bash"

src/logging/timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class Timer
8585
const std::string m_title{};
8686

8787
//! Forwarded on to LogPrint if specified - has the effect of only
88-
//! outputing the timing log when a particular debug= category is specified.
88+
//! outputting the timing log when a particular debug= category is specified.
8989
const BCLog::LogFlags m_log_category{};
9090

9191
};

src/node/psbt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
8484
}
8585
}
8686

87-
// Calculate next role for PSBT by grabbing "minumum" PSBTInput next role
87+
// Calculate next role for PSBT by grabbing "minimum" PSBTInput next role
8888
result.next = PSBTRole::EXTRACTOR;
8989
for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
9090
PSBTInputAnalysis& input_analysis = result.inputs[i];

src/txmempool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ class CTxMemPool
753753
* determine if that transaction has not yet been visited during the current
754754
* traversal's epoch.
755755
* Algorithms using std::set can be replaced on a one by one basis.
756-
* Both techniques are not fundamentally incomaptible across the codebase.
756+
* Both techniques are not fundamentally incompatible across the codebase.
757757
* Generally speaking, however, the remaining use of std::set for mempool
758758
* traversal should be viewed as a TODO for replacement with an epoch based
759759
* traversal, rather than a preference for std::set over epochs in that

test/functional/feature_backwards_compatibility.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def run_test(self):
113113
# Create another conflicting transaction using RBF
114114
tx3_id = self.nodes[1].sendtoaddress(return_address, 1)
115115
tx4_id = self.nodes[1].bumpfee(tx3_id)["txid"]
116-
# Abondon transaction, but don't confirm
116+
# Abandon transaction, but don't confirm
117117
self.nodes[1].abandontransaction(tx3_id)
118118

119119
# w1_v19: regular wallet, created with v0.19

test/lint/lint-shell.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if ! shellcheck "$EXCLUDE" $(git ls-files -- '*.sh' | grep -vE 'src/(leveldb|sec
4141
fi
4242

4343
if ! command -v yq > /dev/null; then
44-
echo "Skipping Gitian desriptor scripts checking since yq is not installed."
44+
echo "Skipping Gitian descriptor scripts checking since yq is not installed."
4545
exit $EXIT_CODE
4646
fi
4747

test/lint/lint-spelling.ignore-words.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ keyserver
1212
homogenous
1313
setban
1414
hist
15+
ser
16+
unselect

0 commit comments

Comments
 (0)