sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 05:23:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make CScriptNum() take nMaxNumSize as an argument

Browse Source 
While the existing numeric opcodes are all limited to 4-byte bignum
arguments, new opcodes will need different limits.
This commit is contained in:
Peter Todd 2014-09-29 01:00:01 -04:00
parent 7eb66182f3
commit 99088d60d8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/script/script.h
View File

@ -195,7 +195,10 @@ public:
m_value = n; m_value = n;
} }
explicit CScriptNum(const std::vector<unsigned char>& vch, bool fRequireMinimal) static const size_t nDefaultMaxNumSize = 4;
explicit CScriptNum(const std::vector<unsigned char>& vch, bool fRequireMinimal,
const size_t nMaxNumSize = nDefaultMaxNumSize)
{ {
if (vch.size() > nMaxNumSize) { if (vch.size() > nMaxNumSize) {
throw scriptnum_error("script number overflow"); throw scriptnum_error("script number overflow");
@ -318,8 +321,6 @@ public:
return result; return result;
} }
static const size_t nMaxNumSize = 4;
private: private:
static int64_t set_vch(const std::vector<unsigned char>& vch) static int64_t set_vch(const std::vector<unsigned char>& vch)
{ {

2
src/test/scriptnum_tests.cpp
View File

@ -145,7 +145,7 @@ static void RunCreate(const int64_t& num)
{ {
CheckCreateInt(num); CheckCreateInt(num);
CScriptNum scriptnum(num); CScriptNum scriptnum(num);
if (scriptnum.getvch().size() <= CScriptNum::nMaxNumSize) if (scriptnum.getvch().size() <= CScriptNum::nDefaultMaxNumSize)
CheckCreateVch(num); CheckCreateVch(num);
else else
{ {