Skip to content

Commit

Permalink
Remove UpdateVersionBitsParameters
Browse files Browse the repository at this point in the history
Moves setting struct member fields from a function to its call site.
This improves readability by surfacing the code.
  • Loading branch information
dongcarl authored and TheCharlatan committed Mar 15, 2023
1 parent 84b8578 commit d938098
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,9 @@ class CRegTestParams : public CChainParams
}

for (const auto& [deployment_pos, version_bits_params] : opts.version_bits_parameters) {
UpdateVersionBitsParameters(deployment_pos, version_bits_params.start_time, version_bits_params.timeout, version_bits_params.min_activation_height);
consensus.vDeployments[deployment_pos].nStartTime = version_bits_params.start_time;
consensus.vDeployments[deployment_pos].nTimeout = version_bits_params.timeout;
consensus.vDeployments[deployment_pos].min_activation_height = version_bits_params.min_activation_height;
}

genesis = CreateGenesisBlock(1296688602, 2, 0x207fffff, 1, 50 * COIN);
Expand Down Expand Up @@ -511,16 +513,6 @@ class CRegTestParams : public CChainParams

bech32_hrp = "bcrt";
}

/**
* Allows modifying the Version Bits regtest parameters.
*/
void UpdateVersionBitsParameters(Consensus::DeploymentPos d, int64_t nStartTime, int64_t nTimeout, int min_activation_height)
{
consensus.vDeployments[d].nStartTime = nStartTime;
consensus.vDeployments[d].nTimeout = nTimeout;
consensus.vDeployments[d].min_activation_height = min_activation_height;
}
};

void ReadRegTestArgs(const ArgsManager& args, CChainParams::RegTestOptions& options)
Expand Down

0 comments on commit d938098

Please sign in to comment.