Make CScriptNum() take nMaxNumSize as an argument

petertodd · petertodd · commit 99088d60d8a7 · 2015-05-09T04:29:47.000-04:00
While the existing numeric opcodes are all limited to 4-byte bignum
arguments, new opcodes will need different limits.
diff --git a/src/script/script.h b/src/script/script.h
@@ -195,7 +195,10 @@ class CScriptNum
         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) {
             throw scriptnum_error("script number overflow");
@@ -318,8 +321,6 @@ class CScriptNum
         return result;
     }
 
-    static const size_t nMaxNumSize = 4;
-
 private:
     static int64_t set_vch(const std::vector<unsigned char>& vch)
     {
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
@@ -145,7 +145,7 @@ static void RunCreate(const int64_t& num)
 {
     CheckCreateInt(num);
     CScriptNum scriptnum(num);
-    if (scriptnum.getvch().size() <= CScriptNum::nMaxNumSize)
+    if (scriptnum.getvch().size() <= CScriptNum::nDefaultMaxNumSize)
         CheckCreateVch(num);
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,10 @@ class CScriptNum`
`195`	`195`	`m_value = n;`
`196`	`196`	`}`
`197`	`197`
`198`		`- explicit CScriptNum(const std::vector<unsigned char>& vch, bool fRequireMinimal)`
	`198`	`+ static const size_t nDefaultMaxNumSize = 4;`
	`199`	`+`
	`200`	`+ explicit CScriptNum(const std::vector<unsigned char>& vch, bool fRequireMinimal,`
	`201`	`+ const size_t nMaxNumSize = nDefaultMaxNumSize)`
`199`	`202`	`{`
`200`	`203`	`if (vch.size() > nMaxNumSize) {`
`201`	`204`	`throw scriptnum_error("script number overflow");`
`@@ -318,8 +321,6 @@ class CScriptNum`
`318`	`321`	`return result;`
`319`	`322`	`}`
`320`	`323`
`321`		`- static const size_t nMaxNumSize = 4;`
`322`		`-`
`323`	`324`	`private:`
`324`	`325`	`static int64_t set_vch(const std::vector<unsigned char>& vch)`
`325`	`326`	`{`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static void RunCreate(const int64_t& num)`
`145`	`145`	`{`
`146`	`146`	`CheckCreateInt(num);`
`147`	`147`	`CScriptNum scriptnum(num);`
`148`		`- if (scriptnum.getvch().size() <= CScriptNum::nMaxNumSize)`
	`148`	`+ if (scriptnum.getvch().size() <= CScriptNum::nDefaultMaxNumSize)`
`149`	`149`	`CheckCreateVch(num);`
`150`	`150`	`else`
`151`	`151`	`{`