Browse Source

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

86efa30 [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (Jonas Schnelli)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
0f24eaf253
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 4
      src/Makefile.test.include
  2. 2
      src/bitcoin-tx.cpp

4
src/Makefile.test.include

@ -17,7 +17,9 @@ EXTRA_DIST += \ @@ -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 \

2
src/bitcoin-tx.cpp

@ -206,7 +206,7 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput) @@ -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);

Loading…
Cancel
Save