Use TxId when constructing a CTxIn

Summary: Increase type safety. Test Plan: make check Reviewers: #bitcoin_abc, jasonbcox Reviewed By: #bitcoin_abc, jasonbcox Subscribers: teamcity Differential Revision: https://reviews.bitcoinabc.org/D1433
dgenr8 · May 23, 2018 · b7f75a2 · b7f75a2
1 parent 013489c
commit b7f75a2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -242,7 +242,7 @@ static void MutateTxAddInput(CMutableTransaction &tx,
         throw std::runtime_error("invalid TX input txid");
     }
 
-    uint256 txid(uint256S(strTxid));
+    TxId txid(uint256S(strTxid));
 
     static const unsigned int minTxOutSz = 9;
     static const unsigned int maxVout = MAX_TX_SIZE / minTxOutSz;

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -123,9 +123,9 @@ class CTxIn {
     explicit CTxIn(COutPoint prevoutIn, CScript scriptSigIn = CScript(),
                    uint32_t nSequenceIn = SEQUENCE_FINAL)
         : prevout(prevoutIn), scriptSig(scriptSigIn), nSequence(nSequenceIn) {}
-    CTxIn(uint256 hashPrevTx, uint32_t nOut, CScript scriptSigIn = CScript(),
+    CTxIn(TxId prevTxId, uint32_t nOut, CScript scriptSigIn = CScript(),
           uint32_t nSequenceIn = SEQUENCE_FINAL)
-        : CTxIn(COutPoint(hashPrevTx, nOut), scriptSigIn, nSequenceIn) {}
+        : CTxIn(COutPoint(prevTxId, nOut), scriptSigIn, nSequenceIn) {}
 
     ADD_SERIALIZE_METHODS;
 

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -742,7 +742,7 @@ static bool AcceptToMemoryPoolWorker(
     AssertLockHeld(cs_main);
 
     const CTransaction &tx = *ptx;
-    const uint256 txid = tx.GetId();
+    const TxId txid = tx.GetId();
     if (pfMissingInputs) {
         *pfMissingInputs = false;
     }