mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-18 22:35:39 +01:00
Merge #13954: Warn (don't fail!) on spelling errors. Fix typos reported by codespell.
f8a81f73aclint: Add spell check linter (codespell) (practicalswift)ada356208eFix typos reported by codespell (practicalswift) Pull request description: * Check for common misspellings using `codespell`. * Fix recently introduced typos reported by `codespell`. Tree-SHA512: 9974c0e640b411c7d0ebc5b45de253c19bac7fe3002cd98601ff8da8db584224c2fd7d331aee3df612c9f2cfef540d647a9b4c5a1a73fd208dc93ce4bf9e5e3e
This commit is contained in:
@@ -76,7 +76,7 @@ class ExampleTest(BitcoinTestFramework):
|
||||
def set_test_params(self):
|
||||
"""Override test parameters for your individual test.
|
||||
|
||||
This method must be overridden and num_nodes must be exlicitly set."""
|
||||
This method must be overridden and num_nodes must be explicitly set."""
|
||||
self.setup_clean_chain = True
|
||||
self.num_nodes = 3
|
||||
# Use self.extra_args to change command-line arguments for the nodes
|
||||
|
||||
@@ -989,7 +989,7 @@ class FullBlockTest(BitcoinTestFramework):
|
||||
assert_equal(get_legacy_sigopcount_block(b73), MAX_BLOCK_SIGOPS + 1)
|
||||
self.sync_blocks([b73], success=False, reject_code=16, reject_reason=b'bad-blk-sigops', reconnect=True)
|
||||
|
||||
# b74/75 - if we push an invalid script element, all prevous sigops are counted,
|
||||
# b74/75 - if we push an invalid script element, all previous sigops are counted,
|
||||
# but sigops after the element are not counted.
|
||||
#
|
||||
# The invalid script element is that the push_data indicates that
|
||||
|
||||
@@ -15,8 +15,8 @@ class LongpollThread(threading.Thread):
|
||||
def __init__(self, node):
|
||||
threading.Thread.__init__(self)
|
||||
# query current longpollid
|
||||
templat = node.getblocktemplate()
|
||||
self.longpollid = templat['longpollid']
|
||||
template = node.getblocktemplate()
|
||||
self.longpollid = template['longpollid']
|
||||
# create a new connection to the node, we can't use the same
|
||||
# connection from two threads
|
||||
self.node = get_rpc_proxy(node.url, 1, timeout=600, coveragedir=node.coverage_dir)
|
||||
@@ -31,11 +31,11 @@ class GetBlockTemplateLPTest(BitcoinTestFramework):
|
||||
def run_test(self):
|
||||
self.log.info("Warning: this test will take about 70 seconds in the best case. Be patient.")
|
||||
self.nodes[0].generate(10)
|
||||
templat = self.nodes[0].getblocktemplate()
|
||||
longpollid = templat['longpollid']
|
||||
template = self.nodes[0].getblocktemplate()
|
||||
longpollid = template['longpollid']
|
||||
# longpollid should not change between successive invocations if nothing else happens
|
||||
templat2 = self.nodes[0].getblocktemplate()
|
||||
assert(templat2['longpollid'] == longpollid)
|
||||
template2 = self.nodes[0].getblocktemplate()
|
||||
assert(template2['longpollid'] == longpollid)
|
||||
|
||||
# Test 1: test that the longpolling wait if we do nothing
|
||||
thr = LongpollThread(self.nodes[0])
|
||||
|
||||
@@ -76,7 +76,7 @@ class InvalidTxRequestTest(BitcoinTestFramework):
|
||||
self.reconnect_p2p(num_connections=2)
|
||||
|
||||
self.log.info('Test orphan transaction handling ... ')
|
||||
# Create a root transaction that we withhold until all dependend transactions
|
||||
# Create a root transaction that we withhold until all dependent transactions
|
||||
# are sent out and in the orphan cache
|
||||
SCRIPT_PUB_KEY_OP_TRUE = b'\x51\x75' * 15 + b'\x51'
|
||||
tx_withhold = CTransaction()
|
||||
|
||||
@@ -89,7 +89,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
|
||||
sync_blocks([self.nodes[0], self.nodes[2]], timeout=5)
|
||||
except:
|
||||
pass
|
||||
# node2 must remain at heigh 0
|
||||
# node2 must remain at height 0
|
||||
assert_equal(self.nodes[2].getblockheader(self.nodes[2].getbestblockhash())['height'], 0)
|
||||
|
||||
# now connect also to node 1 (non pruned)
|
||||
|
||||
@@ -471,7 +471,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||
blocks are permitted to contain witnesses)."""
|
||||
|
||||
# node2 doesn't need to be connected for this test.
|
||||
# (If it's connected, node0 may propogate an invalid block to it over
|
||||
# (If it's connected, node0 may propagate an invalid block to it over
|
||||
# compact blocks and the nodes would have inconsistent tips.)
|
||||
disconnect_nodes(self.nodes[0], 2)
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ class PSBTTest(BitcoinTestFramework):
|
||||
signedtx = self.nodes[0].signrawtransactionwithwallet(rawtx['hex'])
|
||||
assert_raises_rpc_error(-22, "TX decode failed", self.nodes[0].converttopsbt, signedtx['hex'])
|
||||
|
||||
# Explicilty allow converting non-empty txs
|
||||
# Explicitly allow converting non-empty txs
|
||||
new_psbt = self.nodes[0].converttopsbt(rawtx['hex'])
|
||||
self.nodes[0].decodepsbt(new_psbt)
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ def create_tx_with_script(prevtx, n, script_sig=b"", *, amount, script_pub_key=C
|
||||
"""Return one-input, one-output transaction object
|
||||
spending the prevtx's n-th output with the given amount.
|
||||
|
||||
Can optionally pass scriptPubKey and scriptSig, default is anyone-can-spend ouput.
|
||||
Can optionally pass scriptPubKey and scriptSig, default is anyone-can-spend output.
|
||||
"""
|
||||
tx = CTransaction()
|
||||
assert(n < len(prevtx.vout))
|
||||
|
||||
6
test/lint/lint-spelling.ignore-words.txt
Normal file
6
test/lint/lint-spelling.ignore-words.txt
Normal file
@@ -0,0 +1,6 @@
|
||||
cas
|
||||
hights
|
||||
mor
|
||||
objext
|
||||
unselect
|
||||
useable
|
||||
15
test/lint/lint-spelling.sh
Executable file
15
test/lint/lint-spelling.sh
Executable file
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Copyright (c) 2018 The Bitcoin Core developers
|
||||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
#
|
||||
# Warn in case of spelling errors.
|
||||
# Note: Will exit successfully regardless of spelling errors.
|
||||
|
||||
export LC_ALL=C
|
||||
|
||||
IGNORE_WORDS_FILE=test/lint/lint-spelling.ignore-words.txt
|
||||
if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/" ":(exclude)doc/release-notes/" ":(exclude)src/leveldb/" ":(exclude)src/qt/locale/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/"); then
|
||||
echo "^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in ${IGNORE_WORDS_FILE}"
|
||||
fi
|
||||
Reference in New Issue
Block a user