Skip to content

Commit 236cd23

Browse files
committed
Merge bitcoin#27197: Fix typos in comments to make linter happy
987f1bb Fixed a couple of typos in comments to make linter happy (hernanmarino) Pull request description: While working on a different PR, I stumbled upon a couple of typos being reported by the linter and fixed them. ACKs for top commit: kristapsk: utACK 987f1bb Tree-SHA512: bf53e150bb7c6b59a9dc270bdf748bf8fb0430f35d1d0a68ef70e9345d322470c4a0b5cd7f2c3cfc81ce087bb6624d820d5f4501f58aaa5806f358ddd4e0b551
2 parents 3b88c85 + 987f1bb commit 236cd23

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/script/sign.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
102102
* @param provider Utility containing the information necessary to solve a script.
103103
* @param fromPubKey The script to produce a satisfaction for.
104104
* @param txTo The spending transaction.
105-
* @param nIn The index of the input in `txTo` refering the output being spent.
105+
* @param nIn The index of the input in `txTo` referring the output being spent.
106106
* @param amount The value of the output being spent.
107107
* @param nHashType Signature hash type.
108108
* @param sig_data Additional data provided to solve a script. Filled with the resulting satisfying

src/test/fuzz/miniscript.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ struct SmartInfo
458458
Type type_zo = zo == 0 ? "z"_mst : zo == 1 ? "o"_mst : ""_mst;
459459
for (int n = 0; n < 2; ++n) { /* select from (none),n */
460460
if (zo == 0 && n == 1) continue; /* z conflicts with n */
461-
if (base == 3 && n == 1) continue; /* W conficts with n */
461+
if (base == 3 && n == 1) continue; /* W conflicts with n */
462462
Type type_n = n == 0 ? ""_mst : "n"_mst;
463463
for (int d = 0; d < 2; ++d) { /* select from (none),d */
464464
if (base == 2 && d == 1) continue; /* V conflicts with d */
@@ -940,7 +940,7 @@ void TestNode(const NodeRef& node, FuzzedDataProvider& provider)
940940
auto decoded = miniscript::FromScript(script, PARSER_CTX);
941941
assert(decoded);
942942
// Note we can't use *decoded == *node because the miniscript representation may differ, so we check that:
943-
// - The script corresponding to that decoded form matchs exactly
943+
// - The script corresponding to that decoded form matches exactly
944944
// - The type matches exactly
945945
assert(decoded->ToScript(PARSER_CTX) == script);
946946
assert(decoded->GetType() == node->GetType());

0 commit comments

Comments
 (0)