diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-06-26 13:36:41 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2020-07-30 13:57:54 -0700 |
| commit | 77c507358bda9bd6c496f33e0f4418c0603bb08d (patch) | |
| tree | 53e59bb680078392dbc32315c0b0f2adcde882f9 /src/script | |
| parent | 02c4cc5c5ddf61f98ee366a4bea8abc26de492bd (diff) | |
| download | bitcoin-77c507358bda9bd6c496f33e0f4418c0603bb08d.tar.xz | |
Make Hash[160] consume range-like objects
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/standard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 1c4990791c..3a4882f280 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -16,10 +16,10 @@ typedef std::vector<unsigned char> valtype; bool fAcceptDatacarrier = DEFAULT_ACCEPT_DATACARRIER; unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY; -CScriptID::CScriptID(const CScript& in) : BaseHash(Hash160(in.begin(), in.end())) {} +CScriptID::CScriptID(const CScript& in) : BaseHash(Hash160(in)) {} CScriptID::CScriptID(const ScriptHash& in) : BaseHash(static_cast<uint160>(in)) {} -ScriptHash::ScriptHash(const CScript& in) : BaseHash(Hash160(in.begin(), in.end())) {} +ScriptHash::ScriptHash(const CScript& in) : BaseHash(Hash160(in)) {} ScriptHash::ScriptHash(const CScriptID& in) : BaseHash(static_cast<uint160>(in)) {} PKHash::PKHash(const CPubKey& pubkey) : BaseHash(pubkey.GetID()) {} @@ -318,7 +318,7 @@ CScript GetScriptForWitness(const CScript& redeemscript) std::vector<std::vector<unsigned char> > vSolutions; TxoutType typ = Solver(redeemscript, vSolutions); if (typ == TxoutType::PUBKEY) { - return GetScriptForDestination(WitnessV0KeyHash(Hash160(vSolutions[0].begin(), vSolutions[0].end()))); + return GetScriptForDestination(WitnessV0KeyHash(Hash160(vSolutions[0]))); } else if (typ == TxoutType::PUBKEYHASH) { return GetScriptForDestination(WitnessV0KeyHash(uint160{vSolutions[0]})); } |