diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-08 09:58:15 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-08 09:58:56 +0200 |
| commit | 0f24eaf253abe7d1479777ef10f8f4e8eeb9d06e (patch) | |
| tree | f0096ee67e15d45b3b22b535a8b006948864c95f | |
| parent | 79004d4ae67164d980fdaab4de9d9d467cdb9b88 (diff) | |
| parent | 86efa30ae3fd36aa77b19ff0f70bb89be9ec308e (diff) | |
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)
| -rw-r--r-- | src/Makefile.test.include | 4 | ||||
| -rw-r--r-- | src/bitcoin-tx.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 77cf1001e1..2d7791232d 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -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 \ diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index d5e2fc279b..f9ea94b9f4 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -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); |