diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -127,9 +127,11 @@ CTxIn() { nSequence = SEQUENCE_FINAL; } explicit CTxIn(COutPoint prevoutIn, CScript scriptSigIn = CScript(), - uint32_t nSequenceIn = SEQUENCE_FINAL); + uint32_t nSequenceIn = SEQUENCE_FINAL) + : prevout(prevoutIn), scriptSig(scriptSigIn), nSequence(nSequenceIn) {} CTxIn(uint256 hashPrevTx, uint32_t nOut, CScript scriptSigIn = CScript(), - uint32_t nSequenceIn = SEQUENCE_FINAL); + uint32_t nSequenceIn = SEQUENCE_FINAL) + : CTxIn(COutPoint(hashPrevTx, nOut), scriptSigIn, nSequenceIn) {} ADD_SERIALIZE_METHODS; @@ -161,7 +163,8 @@ CTxOut() { SetNull(); } - CTxOut(const Amount &nValueIn, CScript scriptPubKeyIn); + CTxOut(Amount nValueIn, CScript scriptPubKeyIn) + : nValue(nValueIn), scriptPubKey(scriptPubKeyIn) {} ADD_SERIALIZE_METHODS; diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -13,19 +13,6 @@ return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0, 10), n); } -CTxIn::CTxIn(COutPoint prevoutIn, CScript scriptSigIn, uint32_t nSequenceIn) { - prevout = prevoutIn; - scriptSig = scriptSigIn; - nSequence = nSequenceIn; -} - -CTxIn::CTxIn(uint256 hashPrevTx, uint32_t nOut, CScript scriptSigIn, - uint32_t nSequenceIn) { - prevout = COutPoint(hashPrevTx, nOut); - scriptSig = scriptSigIn; - nSequence = nSequenceIn; -} - std::string CTxIn::ToString() const { std::string str; str += "CTxIn("; @@ -42,11 +29,6 @@ return str; } -CTxOut::CTxOut(const Amount &nValueIn, CScript scriptPubKeyIn) { - nValue = nValueIn; - scriptPubKey = scriptPubKeyIn; -} - std::string CTxOut::ToString() const { return strprintf("CTxOut(nValue=%d.%08d, scriptPubKey=%s)", nValue.GetSatoshis() / COIN.GetSatoshis(),