Skip to content

Commit a50d7a7

Browse files
committed
Merge bitcoin/bitcoin#34183: doc: fix double-word typos in comments
08ed802 doc: fix double-word typos in comments (bensig) Pull request description: Spotted a few duplicated words while reading through the code: 1. "the the" in mempool_stress.cpp 2. "to to" in txgraph.cpp 3. "for for" in cluster_linearize.h 4. "that that" in txrequest.h 5. "in in" in test/fuzz/txgraph.cpp ACKs for top commit: l0rinc: ACK 08ed802 maflcko: lgtm ACK 08ed802 Tree-SHA512: e4eeb9a95489b4c46fbb7a0dbeb549d70a2b087ab6400cc6ba89cbfc015b40e580fab8a68913499af7c83a988e66642dcc7a222b70d2eda5c57f4a02b5a556ae
2 parents 2bff9eb + 08ed802 commit a50d7a7

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/bench/mempool_stress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static void ComplexMemPool(benchmark::Bench& bench)
140140

141141
// Add all transactions to the mempool.
142142
// Also store the first 10 transactions from each cluster as the
143-
// transactions we'll "mine" in the the benchmark.
143+
// transactions we'll "mine" in the benchmark.
144144
int tx_count = 0;
145145
for (auto& tx : transactions) {
146146
if (tx_count < 10) {

src/cluster_linearize.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class DepGraph
3838
/** All descendants of the transaction (including itself). */
3939
SetType descendants;
4040

41-
/** Equality operator (primarily for for testing purposes). */
41+
/** Equality operator (primarily for testing purposes). */
4242
friend bool operator==(const Entry&, const Entry&) noexcept = default;
4343

4444
/** Construct an empty entry. */

src/test/fuzz/txgraph.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ FUZZ_TARGET(txgraph)
710710
std::shuffle(refs.begin(), refs.end(), rng);
711711
// Invoke the real function.
712712
auto result = real->CountDistinctClusters(refs, level_select);
713-
// Build a set with representatives of the clusters the Refs occur in in the
713+
// Build a set with representatives of the clusters the Refs occur in the
714714
// simulated graph. For each, remember the lowest-index transaction SimPos in the
715715
// cluster.
716716
SimTxGraph::SetType sim_reps;

src/txgraph.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ void TxGraphImpl::GroupClusters(int level) noexcept
18341834
// Sort an_deps by applying the same order to the involved child cluster.
18351835
std::sort(an_deps.begin(), an_deps.end(), [&](auto& a, auto& b) noexcept { return a.second < b.second; });
18361836

1837-
// Run the union-find algorithm to to find partitions of the input Clusters which need to be
1837+
// Run the union-find algorithm to find partitions of the input Clusters which need to be
18381838
// grouped together. See https://en.wikipedia.org/wiki/Disjoint-set_data_structure.
18391839
{
18401840
/** Each PartitionData entry contains information about a single input Cluster. */

src/txrequest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* - Which peer announced it (through their NodeId)
2626
* - The txid or wtxid of the transaction (collectively called "txhash" in what follows)
2727
* - Whether it was a tx or wtx announcement (see BIP339).
28-
* - What the earliest permitted time is that that transaction can be requested from that peer (called "reqtime").
28+
* - What the earliest permitted time is that the transaction can be requested from that peer (called "reqtime").
2929
* - Whether it's from a "preferred" peer or not. Which announcements get this flag is determined by the caller, but
3030
* this is designed for outbound peers, or other peers that we have a higher level of trust in. Even when the
3131
* peers' preferredness changes, the preferred flag of existing announcements from that peer won't change.

0 commit comments

Comments
 (0)