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

Merge #8164: [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue

Browse Source 
86efa30 [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2016-06-08 09:58:15 +02:00 committed by Alexander Block
parent 9af87c8269
commit 0b8169d498
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.test.include
View File

@ -17,7 +17,9 @@ EXTRA_DIST += \
test/data/txcreate2.hex \ test/data/txcreate2.hex \
test/data/txcreatedata1.hex \ test/data/txcreatedata1.hex \
test/data/txcreatedata2.hex \ test/data/txcreatedata2.hex \
test/data/txcreatesign.hex test/data/txcreatesign.hex \
test/data/txcreatedata_seq0.hex \
test/data/txcreatedata_seq1.hex
JSON_TEST_FILES = \ JSON_TEST_FILES = \
test/data/script_tests.json \ test/data/script_tests.json \

2
src/dash-tx.cpp
View File

@ -215,7 +215,7 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
// extract the optional sequence number // extract the optional sequence number
uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max(); uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max();
if (vStrInputParts.size() > 2) if (vStrInputParts.size() > 2)
nSequenceIn = atoi(vStrInputParts[2]); nSequenceIn = std::stoul(vStrInputParts[2]);
// append to transaction input list // append to transaction input list
CTxIn txin(txid, vout, CScript(), nSequenceIn); CTxIn txin(txid, vout, CScript(), nSequenceIn);