mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge e53310c47a into merged_master (Bitcoin PR bitcoin/bitcoin#30529)
This commit is contained in:
commit
b9a1c93e74
13 changed files with 96 additions and 42 deletions
|
|
@ -34,10 +34,10 @@ using util::SplitString;
|
|||
|
||||
void ReadSigNetArgs(const ArgsManager& args, CChainParams::SigNetOptions& options)
|
||||
{
|
||||
if (args.IsArgSet("-signetseednode")) {
|
||||
if (!args.GetArgs("-signetseednode").empty()) {
|
||||
options.seeds.emplace(args.GetArgs("-signetseednode"));
|
||||
}
|
||||
if (args.IsArgSet("-signetchallenge")) {
|
||||
if (!args.GetArgs("-signetchallenge").empty()) {
|
||||
const auto signet_challenge = args.GetArgs("-signetchallenge");
|
||||
if (signet_challenge.size() != 1) {
|
||||
throw std::runtime_error("-signetchallenge cannot be multiple values.");
|
||||
|
|
@ -75,8 +75,6 @@ void ReadRegTestArgs(const ArgsManager& args, CChainParams::RegTestOptions& opti
|
|||
}
|
||||
}
|
||||
|
||||
if (!args.IsArgSet("-vbparams")) return;
|
||||
|
||||
for (const std::string& strDeployment : args.GetArgs("-vbparams")) {
|
||||
std::vector<std::string> vDeploymentParams = SplitString(strDeployment, ':');
|
||||
if (vDeploymentParams.size() < 3 || 4 < vDeploymentParams.size()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue