Merge c95784e3d3 into merged_master (Bitcoin PR #20016)

This commit is contained in:
Andrew Poelstra 2020-11-29 22:31:43 +00:00
commit 07d50b2951
8 changed files with 21 additions and 19 deletions

View file

@ -662,7 +662,7 @@ std::unique_ptr<CKeyMetadata> LegacyScriptPubKeyMan::GetMetadata(const CTxDestin
uint256 LegacyScriptPubKeyMan::GetID() const
{
return UINT256_ONE();
return uint256::ONE;
}
/**