aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2016-06-07 19:57:54 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2016-06-07 21:07:47 +0200
commit86efa30ae3fd36aa77b19ff0f70bb89be9ec308e (patch)
treef0096ee67e15d45b3b22b535a8b006948864c95f
parent79004d4ae67164d980fdaab4de9d9d467cdb9b88 (diff)
[Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue
-rw-r--r--src/Makefile.test.include4
-rw-r--r--src/bitcoin-tx.cpp2
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);