[Backport] Replace uint256(1) with static constant.

furszy · furszy · commit 14319cff2165 · 2020-03-10T23:24:57.000-03:00
SignatureHash and its test function SignatureHashOld
return uint256(1) as a special error signaling value.
Return a local static constant with the same value instead.
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
@@ -1091,14 +1091,14 @@ uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsig
 {
     if (nIn >= txTo.vin.size()) {
         //  nIn out of range
-        return 1;
+        return UINT256_ONE;
     }
 
     // Check for invalid use of SIGHASH_SINGLE
     if ((nHashType & 0x1f) == SIGHASH_SINGLE) {
         if (nIn >= txTo.vout.size()) {
             //  nOut out of range
-            return 1;
+            return UINT256_ONE;
         }
     }
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
@@ -28,7 +28,7 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un
     if (nIn >= txTo.vin.size())
     {
         printf("ERROR: SignatureHash() : nIn=%d out of range\n", nIn);
-        return 1;
+        return UINT256_ONE;
     }
     CMutableTransaction txTmp(txTo);
 
@@ -59,7 +59,7 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un
         if (nOut >= txTmp.vout.size())
         {
             printf("ERROR: SignatureHash() : nOut=%d out of range\n", nOut);
-            return 1;
+            return UINT256_ONE;
         }
         txTmp.vout.resize(nOut+1);
         for (unsigned int i = 0; i < nOut; i++)
diff --git a/src/uint256.h b/src/uint256.h
@@ -418,5 +418,6 @@ inline uint512 uint512S(const std::string& str)
 
 /** constant uint256 instances */
 const uint256 UINT256_ZERO = uint256();
+const uint256 UINT256_ONE = uint256("0000000000000000000000000000000000000000000000000000000000000001");
 
 #endif // PIVX_UINT256_H

Original file line number	Diff line number	Diff line change
`@@ -1091,14 +1091,14 @@ uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsig`
`1091`	`1091`	`{`
`1092`	`1092`	`if (nIn >= txTo.vin.size()) {`
`1093`	`1093`	`// nIn out of range`
`1094`		`- return 1;`
	`1094`	`+ return UINT256_ONE;`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`	`1097`	`// Check for invalid use of SIGHASH_SINGLE`
`1098`	`1098`	`if ((nHashType & 0x1f) == SIGHASH_SINGLE) {`
`1099`	`1099`	`if (nIn >= txTo.vout.size()) {`
`1100`	`1100`	`// nOut out of range`
`1101`		`- return 1;`
	`1101`	`+ return UINT256_ONE;`
`1102`	`1102`	`}`
`1103`	`1103`	`}`
`1104`	`1104`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un`
`28`	`28`	`if (nIn >= txTo.vin.size())`
`29`	`29`	`{`
`30`	`30`	`printf("ERROR: SignatureHash() : nIn=%d out of range\n", nIn);`
`31`		`- return 1;`
	`31`	`+ return UINT256_ONE;`
`32`	`32`	`}`
`33`	`33`	`CMutableTransaction txTmp(txTo);`
`34`	`34`
`@@ -59,7 +59,7 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un`
`59`	`59`	`if (nOut >= txTmp.vout.size())`
`60`	`60`	`{`
`61`	`61`	`printf("ERROR: SignatureHash() : nOut=%d out of range\n", nOut);`
`62`		`- return 1;`
	`62`	`+ return UINT256_ONE;`
`63`	`63`	`}`
`64`	`64`	`txTmp.vout.resize(nOut+1);`
`65`	`65`	`for (unsigned int i = 0; i < nOut; i++)`