diff --git a/src/addresstype.cpp b/src/addresstype.cpp index 0d51b2d4b67..2454cfb5d95 100644 --- a/src/addresstype.cpp +++ b/src/addresstype.cpp @@ -18,27 +18,27 @@ typedef std::vector valtype; ScriptHash::ScriptHash(const CScript& in) : BaseHash(Hash160(in)) {} -ScriptHash::ScriptHash(const CScriptID& in) : BaseHash(static_cast(in)) {} +ScriptHash::ScriptHash(const CScriptID& in) : BaseHash{in} {} PKHash::PKHash(const CPubKey& pubkey) : BaseHash(pubkey.GetID()) {} PKHash::PKHash(const CKeyID& pubkey_id) : BaseHash(pubkey_id) {} WitnessV0KeyHash::WitnessV0KeyHash(const CPubKey& pubkey) : BaseHash(pubkey.GetID()) {} -WitnessV0KeyHash::WitnessV0KeyHash(const PKHash& pubkey_hash) : BaseHash(static_cast(pubkey_hash)) {} +WitnessV0KeyHash::WitnessV0KeyHash(const PKHash& pubkey_hash) : BaseHash{pubkey_hash} {} CKeyID ToKeyID(const PKHash& key_hash) { - return CKeyID{static_cast(key_hash)}; + return CKeyID{uint160{key_hash}}; } CKeyID ToKeyID(const WitnessV0KeyHash& key_hash) { - return CKeyID{static_cast(key_hash)}; + return CKeyID{uint160{key_hash}}; } CScriptID ToScriptID(const ScriptHash& script_hash) { - return CScriptID{static_cast(script_hash)}; + return CScriptID{uint160{script_hash}}; } WitnessV0ScriptHash::WitnessV0ScriptHash(const CScript& in)