Skip to content

Commit c1252b1

Browse files
committed
Merge bitcoin/bitcoin#31520: #31318 followups
4f06ae0 refactor: fix typo in node/types.h (Sjors Provoost) 366fbf1 test: drop extraneous bracket in mining util (Sjors Provoost) Pull request description: #31318 followups Drops an extraneous bracket and fixes a typo. ACKs for top commit: maflcko: lgtm ACK 4f06ae0 vasild: ACK 4f06ae0 ryanofsky: Code review ACK 4f06ae0 Tree-SHA512: e168bab124f1e62f6666a21349ee4ac8ac11aadeb04813513e89f6c8f8479a67bcf3490460fd49c8d7f9b7264a32e7ea95ac727dfe4597a59b934017ec9fe44e
2 parents fa0c473 + 4f06ae0 commit c1252b1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/node/types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
//! @file node/types.h is a home for public enum and struct type definitions
6-
//! that are used by internally by node code, but also used externally by wallet,
6+
//! that are used internally by node code, but also used externally by wallet,
77
//! mining or GUI code.
88
//!
99
//! This file is intended to define only simple types that do not have external

src/test/util/mining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ COutPoint generatetoaddress(const NodeContext& node, const std::string& address)
2525
const auto dest = DecodeDestination(address);
2626
assert(IsValidDestination(dest));
2727
BlockAssembler::Options assembler_options;
28-
assembler_options.coinbase_output_script = {GetScriptForDestination(dest)};
28+
assembler_options.coinbase_output_script = GetScriptForDestination(dest);
2929

3030
return MineBlock(node, assembler_options);
3131
}

0 commit comments

Comments
 (0)