Merge #10705: Trivial: spelling fixes

MarcoFalke · MarcoFalke · commit d7be7b39fa10 · 2017-08-16T00:30:12.000+02:00
f42fc1d doc: spelling fixes (klemens) Pull request description: patch contains some spelling fixes ( just in comments ) as found by a bot ( http://www.misfix.org, https://github.com/ka7/misspell_fixer ). Tree-SHA512: ba6046cfcd81b0783420daae7d776be92dd7b85a593e212f8f1b4403aca9b1b6af12cef7080d4ea5ed4a14952fd25e4300109a59c414e08f5395cdb9947bb750
diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
@@ -76,7 +76,7 @@
 #rpcuser=Ulysseys
 #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
 #
-# The second method `rpcauth` can be added to server startup argument. It is set at intialization time
+# The second method `rpcauth` can be added to server startup argument. It is set at initialization time
 # using the output from the script in share/rpcuser/rpcuser.py after providing a username:
 #
 # ./share/rpcuser/rpcuser.py alice
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -4,7 +4,7 @@ Developer Notes
 Various coding styles have been used during the history of the codebase,
 and the result is not very consistent. However, we're now trying to converge to
 a single style, which is specified below. When writing patches, favor the new
-style over attempting to mimick the surrounding style, except for move-only
+style over attempting to mimic the surrounding style, except for move-only
 commits.
 
 Do not submit patches solely to modify the style of existing code.
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -416,7 +416,7 @@ bool InitHTTPServer()
     LogPrintf("HTTP: creating work queue of depth %d\n", workQueueDepth);
 
     workQueue = new WorkQueue<HTTPClosure>(workQueueDepth);
-    // tranfer ownership to eventBase/HTTP via .release()
+    // transfer ownership to eventBase/HTTP via .release()
     eventBase = base_ctr.release();
     eventHTTP = http_ctr.release();
     return true;
diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp
@@ -44,7 +44,7 @@ NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift,
             // loop through pixels
             for(int x=0;x<img.width();x++)
             {
-                // preserve alpha because QColor::getHsl doesen't return the alpha value
+                // preserve alpha because QColor::getHsl doesn't return the alpha value
                 a = qAlpha(scL[x]);
                 QColor col(scL[x]);
 
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
@@ -69,7 +69,7 @@ void RPCNestedTests::rpcNestedTests()
     RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo "); //whitespace at the end will be tolerated
     QVERIFY(result.substr(0,1) == "{");
 
-    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()[\"chain\"]")); //Quote path identifier are allowed, but look after a child contaning the quotes in the key
+    (RPCConsole::RPCExecuteCommandLine(result, "getblockchaininfo()[\"chain\"]")); //Quote path identifier are allowed, but look after a child containing the quotes in the key
     QVERIFY(result == "null");
 
     (RPCConsole::RPCExecuteCommandLine(result, "createrawtransaction [] {} 0")); //parameter not in brackets are allowed
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     bool fInvalid = false;
 
     // Prefer the "minimal" platform for the test instead of the normal default
-    // platform ("xcb", "windows", or "cocoa") so tests can't unintentially
+    // platform ("xcb", "windows", or "cocoa") so tests can't unintentionally
     // interfere with any background GUIs and don't require extra resources.
     #if defined(WIN32)
         _putenv_s("QT_QPA_PLATFORM", "minimal");
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
@@ -51,7 +51,7 @@ static CBlock BuildBlockTestCase() {
     return block;
 }
 
-// Number of shared use_counts we expect for a tx we havent touched
+// Number of shared use_counts we expect for a tx we haven't touched
 // == 2 (mempool + our copy from the GetSharedTx call)
 #define SHARED_TX_OFFSET 2
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
@@ -275,7 +275,7 @@ UtxoData::iterator FindRandomFrom(const std::set<COutPoint> &utxoSet) {
 // except the emphasis is on testing the functionality of UpdateCoins
 // random txs are created and UpdateCoins is used to update the cache stack
 // In particular it is tested that spending a duplicate coinbase tx
-// has the expected effect (the other duplicate is overwitten at all cache levels)
+// has the expected effect (the other duplicate is overwritten at all cache levels)
 BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
 {
     bool spent_a_duplicate_coinbase = false;
diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
@@ -205,7 +205,7 @@
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 
-["By-time locks, with argument just beyond txin.nSequence (but within numerical boundries)"],
+["By-time locks, with argument just beyond txin.nSequence (but within numerical boundaries)"],
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194305 CHECKSEQUENCEVERIFY 1"]],
 "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
diff --git a/test/functional/bumpfee.py b/test/functional/bumpfee.py
@@ -89,7 +89,7 @@ def test_simple_bumpfee_succeeds(rbf_node, peer_node, dest_address):
     bumped_tx = rbf_node.bumpfee(rbfid)
     assert_equal(bumped_tx["errors"], [])
     assert bumped_tx["fee"] - abs(rbftx["fee"]) > 0
-    # check that bumped_tx propogates, original tx was evicted and has a wallet conflict
+    # check that bumped_tx propagates, original tx was evicted and has a wallet conflict
     sync_mempools((rbf_node, peer_node))
     assert bumped_tx["txid"] in rbf_node.getrawmempool()
     assert bumped_tx["txid"] in peer_node.getrawmempool()
diff --git a/test/functional/example_test.py b/test/functional/example_test.py
@@ -200,7 +200,7 @@ def run_test(self):
         node2.add_connection(connections[1])
         node2.wait_for_verack()
 
-        self.log.info("Wait for node2 reach current tip. Test that it has propogated all the blocks to us")
+        self.log.info("Wait for node2 reach current tip. Test that it has propagated all the blocks to us")
 
         getdata_request = msg_getdata()
         for block in blocks:
diff --git a/test/functional/net.py b/test/functional/net.py
@@ -85,7 +85,7 @@ def _test_getaddednodeinfo(self):
         added_nodes = self.nodes[0].getaddednodeinfo(ip_port)
         assert_equal(len(added_nodes), 1)
         assert_equal(added_nodes[0]['addednode'], ip_port)
-        # check that a non-existant node returns an error
+        # check that a non-existent node returns an error
         assert_raises_jsonrpc(-24, "Node has not been added",
                               self.nodes[0].getaddednodeinfo, '1.1.1.1')
 
diff --git a/test/functional/pruning.py b/test/functional/pruning.py
@@ -136,7 +136,7 @@ def reorg_test(self):
         self.log.info("Invalidating block %s at height %d" % (badhash,invalidheight))
         self.nodes[1].invalidateblock(badhash)
 
-        # We've now switched to our previously mined-24 block fork on node 1, but thats not what we want
+        # We've now switched to our previously mined-24 block fork on node 1, but that's not what we want
         # So invalidate that fork as well, until we're on the same chain as node 0/2 (but at an ancestor 288 blocks ago)
         mainchainhash = self.nodes[0].getblockhash(invalidheight - 1)
         curhash = self.nodes[1].getblockhash(invalidheight - 1)
@@ -199,7 +199,7 @@ def reorg_back(self):
         goalbesthash = self.mainchainhash2
 
         # As of 0.10 the current block download logic is not able to reorg to the original chain created in
-        # create_chain_with_stale_blocks because it doesn't know of any peer thats on that chain from which to
+        # create_chain_with_stale_blocks because it doesn't know of any peer that's on that chain from which to
         # redownload its missing blocks.
         # Invalidate the reorg_test chain in node 0 as well, it can successfully switch to the original chain
         # because it has all the block data.
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
@@ -170,7 +170,7 @@ def main():
     Help text and arguments for individual test script:''',
                                      formatter_class=argparse.RawTextHelpFormatter)
     parser.add_argument('--coverage', action='store_true', help='generate a basic coverage report for the RPC interface')
-    parser.add_argument('--exclude', '-x', help='specify a comma-seperated-list of scripts to exclude.')
+    parser.add_argument('--exclude', '-x', help='specify a comma-separated-list of scripts to exclude.')
     parser.add_argument('--extended', action='store_true', help='run the extended test suite in addition to the basic tests')
     parser.add_argument('--force', '-f', action='store_true', help='run tests even on platforms where they are disabled by default (e.g. windows).')
     parser.add_argument('--help', '-h', '-?', action='store_true', help='print help text and exit')

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`#rpcuser=Ulysseys`
`77`	`77`	`#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593`
`78`	`78`	`#`
`79`		-# The second method `rpcauth` can be added to server startup argument. It is set at intialization time
	`79`	+# The second method `rpcauth` can be added to server startup argument. It is set at initialization time
`80`	`80`	`# using the output from the script in share/rpcuser/rpcuser.py after providing a username:`
`81`	`81`	`#`
`82`	`82`	`# ./share/rpcuser/rpcuser.py alice`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift,`
`44`	`44`	`// loop through pixels`
`45`	`45`	`for(int x=0;x<img.width();x++)`
`46`	`46`	`{`
`47`		`- // preserve alpha because QColor::getHsl doesen't return the alpha value`
	`47`	`+ // preserve alpha because QColor::getHsl doesn't return the alpha value`
`48`	`48`	`a = qAlpha(scL[x]);`
`49`	`49`	`QColor col(scL[x]);`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ static CBlock BuildBlockTestCase() {`
`51`	`51`	`return block;`
`52`	`52`	`}`
`53`	`53`
`54`		`-// Number of shared use_counts we expect for a tx we havent touched`
	`54`	`+// Number of shared use_counts we expect for a tx we haven't touched`
`55`	`55`	`// == 2 (mempool + our copy from the GetSharedTx call)`
`56`	`56`	`#define SHARED_TX_OFFSET 2`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ UtxoData::iterator FindRandomFrom(const std::set<COutPoint> &utxoSet) {`
`275`	`275`	`// except the emphasis is on testing the functionality of UpdateCoins`
`276`	`276`	`// random txs are created and UpdateCoins is used to update the cache stack`
`277`	`277`	`// In particular it is tested that spending a duplicate coinbase tx`
`278`		`-// has the expected effect (the other duplicate is overwitten at all cache levels)`
	`278`	`+// has the expected effect (the other duplicate is overwritten at all cache levels)`
`279`	`279`	`BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)`
`280`	`280`	`{`
`281`	`281`	`bool spent_a_duplicate_coinbase = false;`