Permalink
Browse files

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

…ssue

86efa30 [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (Jonas Schnelli)
  • Loading branch information...
laanwj committed Jun 8, 2016
2 parents 79004d4 + 86efa30 commit 0f24eaf253abe7d1479777ef10f8f4e8eeb9d06e
Showing with 4 additions and 2 deletions.
  1. +3 −1 src/Makefile.test.include
  2. +1 −1 src/bitcoin-tx.cpp
@@ -17,7 +17,9 @@ EXTRA_DIST += \
test/data/txcreate2.hex \
test/data/txcreatedata1.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 = \
test/data/script_tests.json \
View
@@ -206,7 +206,7 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
// extract the optional sequence number
uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max();
if (vStrInputParts.size() > 2)
nSequenceIn = atoi(vStrInputParts[2]);
nSequenceIn = std::stoul(vStrInputParts[2]);
// append to transaction input list
CTxIn txin(txid, vout, CScript(), nSequenceIn);

0 comments on commit 0f24eaf

Please sign in to comment.