phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bitcoin/bitcoin#29738: doc: fix typos

Browse source 
601edd8ee8 ci: use codespell 2.2.6 (fanquake)
52fa0d285f doc: fix some typos (crazeteam)
b5ed13a240 doc: Fix typos (RoboSchmied)

Pull request description:

  Combines the recent PRs to fix typos so they can be merged.

ACKs for top commit:
  brunoerg:
    crACK 601edd8ee8
  tdb3:
    crACK 601edd8ee8
  kristapsk:
    cr utACK 601edd8ee8

Tree-SHA512: d054b1dad1336d6b9291cc5d5252d4debf6424a993d4edd6a97d7c15055a7fc48a333d30967f72e7dc9c6c1d9a9038ca8bb5e219c529f4c2365ea48404a508d0
This commit is contained in:
fanquake 2024-04-01 15:54:00 +02:00
commit 8d19d688f4
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/lint/04_install.sh
View file

@ -46,7 +46,7 @@ if [ ! -d "${LINT_RUNNER_PATH}" ]; then
fi fi
${CI_RETRY_EXE} pip3 install \ ${CI_RETRY_EXE} pip3 install \
codespell==2.2.5 \ codespell==2.2.6 \
flake8==6.1.0 \ flake8==6.1.0 \
lief==0.13.2 \ lief==0.13.2 \
mypy==1.4.1 \ mypy==1.4.1 \

2
contrib/guix/patches/glibc-2.27-fcommon.patch
View file

@ -5,7 +5,7 @@ Date: Fri May 6 11:03:04 2022 +0100
build: use -fcommon to retain legacy behaviour with GCC 10 build: use -fcommon to retain legacy behaviour with GCC 10
GCC 10 started using -fno-common by default, which causes issues with GCC 10 started using -fno-common by default, which causes issues with
the powerpc builds using gibc 2.27. A patch was commited to glibc to fix the powerpc builds using gibc 2.27. A patch was committed to glibc to fix
the issue, 18363b4f010da9ba459b13310b113ac0647c2fcc but is non-trvial the issue, 18363b4f010da9ba459b13310b113ac0647c2fcc but is non-trvial
to backport, and was broken in at least one way, see the followup in to backport, and was broken in at least one way, see the followup in
commit 7650321ce037302bfc2f026aa19e0213b8d02fe6. commit 7650321ce037302bfc2f026aa19e0213b8d02fe6.

2
depends/packages/expat.mk
View file

@ -6,7 +6,7 @@ $(package)_sha256_hash=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df47
# -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional # -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional
# definitions in endian.h, which are required for a working # definitions in endian.h, which are required for a working
# endianess check in configure when building with -flto. # endianness check in configure when building with -flto.
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples $(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking $(package)_config_opts += --disable-dependency-tracking --enable-option-checking

2
src/cuckoocache.h
View file

@ -359,7 +359,7 @@ public:
* @param bytes the approximate number of bytes to use for this data * @param bytes the approximate number of bytes to use for this data
* structure * structure
* @returns A pair of the maximum number of elements storable (see setup() * @returns A pair of the maximum number of elements storable (see setup()
* documentation for more detail) and the approxmiate total size of these * documentation for more detail) and the approximate total size of these
* elements in bytes or std::nullopt if the size requested is too large. * elements in bytes or std::nullopt if the size requested is too large.
*/ */
std::optional<std::pair<uint32_t, size_t>> setup_bytes(size_t bytes) std::optional<std::pair<uint32_t, size_t>> setup_bytes(size_t bytes)

2
src/script/miniscript.h
View file

@ -1617,7 +1617,7 @@ public:
//! Produce a witness for this script, if possible and given the information available in the context. //! Produce a witness for this script, if possible and given the information available in the context.
//! The non-malleable satisfaction is guaranteed to be valid if it exists, and ValidSatisfaction() //! The non-malleable satisfaction is guaranteed to be valid if it exists, and ValidSatisfaction()
//! is true. If IsSane() holds, this satisfaction is guaranteed to succeed in case the node's //! is true. If IsSane() holds, this satisfaction is guaranteed to succeed in case the node's
//! conditions are satisfied (private keys and hash preimages available, locktimes satsified). //! conditions are satisfied (private keys and hash preimages available, locktimes satisfied).
template<typename Ctx> template<typename Ctx>
Availability Satisfy(const Ctx& ctx, std::vector<std::vector<unsigned char>>& stack, bool nonmalleable = true) const { Availability Satisfy(const Ctx& ctx, std::vector<std::vector<unsigned char>>& stack, bool nonmalleable = true) const {
auto ret = ProduceInput(ctx); auto ret = ProduceInput(ctx);

2
src/validation.cpp
View file

@ -5784,7 +5784,7 @@ bool ChainstateManager::PopulateAndValidateSnapshot(
CBlockIndex* index = nullptr; CBlockIndex* index = nullptr;
// Don't make any modifications to the genesis block since it shouldn't be // Don't make any modifications to the genesis block since it shouldn't be
// neccessary, and since the genesis block doesn't have normal flags like // necessary, and since the genesis block doesn't have normal flags like
// BLOCK_VALID_SCRIPTS set. // BLOCK_VALID_SCRIPTS set.
constexpr int AFTER_GENESIS_START{1}; constexpr int AFTER_GENESIS_START{1};

2
src/validation.h
View file

@ -275,7 +275,7 @@ MempoolAcceptResult AcceptToMemoryPool(Chainstate& active_chainstate, const CTra
* Validate (and maybe submit) a package to the mempool. See doc/policy/packages.md for full details * Validate (and maybe submit) a package to the mempool. See doc/policy/packages.md for full details
* on package validation rules. * on package validation rules.
* @param[in] test_accept When true, run validation checks but don't submit to mempool. * @param[in] test_accept When true, run validation checks but don't submit to mempool.
* @param[in] client_maxfeerate If exceeded by an individual transaction, rest of (sub)package evalution is aborted. * @param[in] client_maxfeerate If exceeded by an individual transaction, rest of (sub)package evaluation is aborted.
* Only for sanity checks against local submission of transactions. * Only for sanity checks against local submission of transactions.
* @returns a PackageMempoolAcceptResult which includes a MempoolAcceptResult for each transaction. * @returns a PackageMempoolAcceptResult which includes a MempoolAcceptResult for each transaction.
* If a transaction fails, validation will exit early and some results may be missing. It is also * If a transaction fails, validation will exit early and some results may be missing. It is also

2
test/functional/p2p_block_sync.py
View file

@ -22,7 +22,7 @@ class BlockSyncTest(BitcoinTestFramework):
# node0 -> node1 -> node2 # node0 -> node1 -> node2
# So node1 has both an inbound and outbound peer. # So node1 has both an inbound and outbound peer.
# In our test, we will mine a block on node0, and ensure that it makes # In our test, we will mine a block on node0, and ensure that it makes
# to to both node1 and node2. # to both node1 and node2.
self.connect_nodes(0, 1) self.connect_nodes(0, 1)
self.connect_nodes(1, 2) self.connect_nodes(1, 2)