Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#31520: #31318 followups
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ryanofsky committed Dec 18, 2024
2 parents fa0c473 + 4f06ae0 commit c1252b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/node/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

//! @file node/types.h is a home for public enum and struct type definitions
//! that are used by internally by node code, but also used externally by wallet,
//! that are used internally by node code, but also used externally by wallet,
//! mining or GUI code.
//!
//! This file is intended to define only simple types that do not have external
Expand Down
2 changes: 1 addition & 1 deletion src/test/util/mining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COutPoint generatetoaddress(const NodeContext& node, const std::string& address)
const auto dest = DecodeDestination(address);
assert(IsValidDestination(dest));
BlockAssembler::Options assembler_options;
assembler_options.coinbase_output_script = {GetScriptForDestination(dest)};
assembler_options.coinbase_output_script = GetScriptForDestination(dest);

return MineBlock(node, assembler_options);
}
Expand Down

0 comments on commit c1252b1

Please sign in to comment.