Skip to content

Commit 1b06ed1

Browse files
author
MarcoFalke
committed
Merge #12283: Fix typos
1340eda Fix typos (practicalswift) Pull request description: Fix typos. Tree-SHA512: 533a136831387ef26e9a74ba078437496bee38cc026da73fa9e6f6e7f4d5665eccac24cf3ef05e6d3af1329a1214f5ce71b039ddb8378b074e6d4408b8701f95
2 parents aa360e7 + 1340eda commit 1b06ed1

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ if test x$use_pkgconfig = xyes; then
934934
m4_ifdef(
935935
[PKG_CHECK_MODULES],
936936
[
937-
PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl not found.)])
938-
PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
937+
PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl not found.)])
938+
PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
939939
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])
940940
if test x$use_qr != xno; then
941941
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])

doc/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Before every minor and major release:
1313
* Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`)
1414
* Write release notes (see below)
1515
* Update `src/chainparams.cpp` nMinimumChainWork with information from the getblockchaininfo rpc.
16-
* Update `src/chainparams.cpp` defaultAssumeValid with information from the getblockhash rpc.
16+
* Update `src/chainparams.cpp` defaultAssumeValid with information from the getblockhash rpc.
1717
- The selected value must not be orphaned so it may be useful to set the value two blocks back from the tip.
1818
- Testnet should be set some tens of thousands back from the tip due to reorgs there.
1919
- This update should be reviewed with a reindex-chainstate with assumevalid=0 to catch any defect

src/chainparams.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class CMainParams : public CChainParams {
126126

127127
// Note that of those which support the service bits prefix, most only support a subset of
128128
// possible options.
129-
// This is fine at runtime as we'll fall back to using them as a oneshot if they dont support the
129+
// This is fine at runtime as we'll fall back to using them as a oneshot if they don't support the
130130
// service bits we want, but we should get them updated to support all service bits wanted by any
131131
// release ASAP to avoid it where possible.
132132
vSeeds.emplace_back("seed.bitcoin.sipa.be"); // Pieter Wuille, only supports x1, x5, x9, and xd

src/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ enum ServiceFlags : uint64_t {
294294
* Thus, generally, avoid calling with peerServices == NODE_NONE, unless
295295
* state-specific flags must absolutely be avoided. When called with
296296
* peerServices == NODE_NONE, the returned desirable service flags are
297-
* guaranteed to not change dependant on state - ie they are suitable for
297+
* guaranteed to not change dependent on state - ie they are suitable for
298298
* use when describing peers which we know to be desirable, but for which
299299
* we do not have a confirmed set of service flags.
300300
*

src/streams.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class CVectorWriter
8282
* @param[in] nVersionIn Serialization Version (including any flags)
8383
* @param[in] vchDataIn Referenced byte vector to overwrite/append
8484
* @param[in] nPosIn Starting position. Vector index where writes should start. The vector will initially
85-
* grow as necessary to max(nPosIn, vec.size()). So to append, use vec.size().
85+
* grow as necessary to max(nPosIn, vec.size()). So to append, use vec.size().
8686
*/
8787
CVectorWriter(int nTypeIn, int nVersionIn, std::vector<unsigned char>& vchDataIn, size_t nPosIn) : nType(nTypeIn), nVersion(nVersionIn), vchData(vchDataIn), nPos(nPosIn)
8888
{

src/sync.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
2525
//
2626
// Early deadlock detection.
2727
// Problem being solved:
28-
// Thread 1 locks A, then B, then C
29-
// Thread 2 locks D, then C, then A
28+
// Thread 1 locks A, then B, then C
29+
// Thread 2 locks D, then C, then A
3030
// --> may result in deadlock between the two threads, depending on when they run.
3131
// Solution implemented here:
3232
// Keep track of pairs of locks: (A before B), (A before C), etc.

src/validation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,7 @@ bool CChainState::ActivateBestChain(CValidationState &state, const CChainParams&
25772577
if (GetMainSignals().CallbacksPending() > 10) {
25782578
// Block until the validation queue drains. This should largely
25792579
// never happen in normal operation, however may happen during
2580-
// reindex, causing memory blowup if we run too far ahead.
2580+
// reindex, causing memory blowup if we run too far ahead.
25812581
SyncWithValidationInterfaceQueue();
25822582
}
25832583

src/wallet/test/wallet_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
103103
// we can't make 3 cents of mature coins
104104
BOOST_CHECK(!testWallet.SelectCoinsMinConf( 3 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet));
105105

106-
// we can make 3 cents of new coins
106+
// we can make 3 cents of new coins
107107
BOOST_CHECK( testWallet.SelectCoinsMinConf( 3 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet));
108108
BOOST_CHECK_EQUAL(nValueRet, 3 * CENT);
109109

test/functional/test_framework/mininode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
77
"""Bitcoin P2P network half-a-node.
88
9-
This python code was modified from ArtForz' public domain half-a-node, as
9+
This python code was modified from ArtForz' public domain half-a-node, as
1010
found in the mini-node branch of http://github.com/jgarzik/pynode.
1111
1212
P2PConnection: A low-level connection object to a node's P2P interface

0 commit comments

Comments
 (0)