From 801e3bfe38e82ca8e99e6628e59dde1f1fe9a060 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Mon, 25 May 2026 19:00:12 -0400 Subject: [PATCH] chainparams: add overloads for RegTest and SigNet with no options For consistency with the overloads introduced in the previous commit, and because there is already a few places where they are useful. --- src/kernel/bitcoinkernel.cpp | 4 ++-- src/kernel/chainparams.cpp | 4 ++-- src/kernel/chainparams.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/kernel/bitcoinkernel.cpp b/src/kernel/bitcoinkernel.cpp index 0a315ff39b3..9eef0b7fb60 100644 --- a/src/kernel/bitcoinkernel.cpp +++ b/src/kernel/bitcoinkernel.cpp @@ -816,10 +816,10 @@ btck_ChainParameters* btck_chain_parameters_create(const btck_ChainType chain_ty return btck_ChainParameters::ref(const_cast(CChainParams::TestNet4().release())); } case btck_ChainType_SIGNET: { - return btck_ChainParameters::ref(const_cast(CChainParams::SigNet({}).release())); + return btck_ChainParameters::ref(const_cast(CChainParams::SigNet().release())); } case btck_ChainType_REGTEST: { - return btck_ChainParameters::ref(const_cast(CChainParams::RegTest({}).release())); + return btck_ChainParameters::ref(const_cast(CChainParams::RegTest().release())); } } assert(false); diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 93bfe335dd2..8b2e66a284a 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -703,8 +703,8 @@ std::optional GetNetworkForMagic(const MessageStartChars& message) const auto mainnet_msg = CChainParams::Main()->MessageStart(); const auto testnet_msg = CChainParams::TestNet()->MessageStart(); const auto testnet4_msg = CChainParams::TestNet4()->MessageStart(); - const auto regtest_msg = CChainParams::RegTest({})->MessageStart(); - const auto signet_msg = CChainParams::SigNet({})->MessageStart(); + const auto regtest_msg = CChainParams::RegTest()->MessageStart(); + const auto signet_msg = CChainParams::SigNet()->MessageStart(); if (std::ranges::equal(message, mainnet_msg)) { return ChainType::MAIN; diff --git a/src/kernel/chainparams.h b/src/kernel/chainparams.h index b78c56356f9..2c85b8e80ef 100644 --- a/src/kernel/chainparams.h +++ b/src/kernel/chainparams.h @@ -168,7 +168,9 @@ public: }; static std::unique_ptr RegTest(const RegTestOptions& options); + static std::unique_ptr RegTest() { const RegTestOptions opts{}; return RegTest(opts); } static std::unique_ptr SigNet(const SigNetOptions& options); + static std::unique_ptr SigNet() { const SigNetOptions opts{}; return SigNet(opts); } static std::unique_ptr Main(const MainNetOptions& options); static std::unique_ptr Main() { const MainNetOptions opts{}; return Main(opts); } static std::unique_ptr TestNet(const TestNetOptions& options);