diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-25 17:32:39 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-25 17:41:00 +0200 |
| commit | 4cef8e05938e55d2d1bb3c36642aa294fb63b6e2 (patch) | |
| tree | 23ce5015967c22d121fe47127ac72ebe92c62cef /src/script/standard.h | |
| parent | 776fa60c4bebb809dfadd9859cc2789769d492b9 (diff) | |
| parent | 984d72ec659361d8c1a6f3c6864e839a807817a7 (diff) | |
Merge #13429: Return the script type from Solver
984d72ec659361d8c1a6f3c6864e839a807817a7 Return the script type from Solver (Ben Woosley)
Pull request description:
Because false is synonymous with TX_NONSTANDARD, this conveys the same
information and makes the handling explicitly based on script type,
simplifying each call site.
Prior to this change it was common for the return value to be ignored, or for the
return value and TX_NONSTANDARD to be redundantly handled.
Tree-SHA512: 31864f856b8cb75f4b782d12678070e8b1cfe9665c6f57cfb25e7ac8bcea8a22f9a78d7c8cf0101c841f2a612400666fb91798bffe88de856e98b873703b0965
Diffstat (limited to 'src/script/standard.h')
| -rw-r--r-- | src/script/standard.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/script/standard.h b/src/script/standard.h index b16ac83e77..fc20fb6a08 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -135,11 +135,10 @@ const char* GetTxnOutputType(txnouttype t); * script hash, for P2PKH it will contain the key hash, etc. * * @param[in] scriptPubKey Script to parse - * @param[out] typeRet The script type * @param[out] vSolutionsRet Vector of parsed pubkeys and hashes - * @return True if script matches standard template + * @return The script type. TX_NONSTANDARD represents a failed solve. */ -bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet); +txnouttype Solver(const CScript& scriptPubKey, std::vector<std::vector<unsigned char>>& vSolutionsRet); /** * Parse a standard scriptPubKey for the destination address. Assigns result to |