Add deserializing constructors to CTransaction and CMutableTransaction

sipa · sipa · commit da60506fc80f · 2016-11-19T17:50:40.000-08:00
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -78,6 +78,10 @@ CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion
     UpdateHash();
 }
 
+CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), wit(std::move(tx.wit)), nLockTime(tx.nLockTime) {
+    UpdateHash();
+}
+
 CTransaction& CTransaction::operator=(const CTransaction &tx) {
     *const_cast<int*>(&nVersion) = tx.nVersion;
     *const_cast<std::vector<CTxIn>*>(&vin) = tx.vin;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -379,6 +379,7 @@ class CTransaction
 
     /** Convert a CMutableTransaction into a CTransaction. */
     CTransaction(const CMutableTransaction &tx);
+    CTransaction(CMutableTransaction &&tx);
 
     CTransaction& operator=(const CTransaction& tx);
 
@@ -392,6 +393,9 @@ class CTransaction
         }
     }
 
+    template <typename Stream>
+    CTransaction(deserialize_type, Stream& s) : CTransaction(CMutableTransaction(deserialize, s)) {}
+
     bool IsNull() const {
         return vin.empty() && vout.empty();
     }
@@ -460,6 +464,11 @@ struct CMutableTransaction
         SerializeTransaction(*this, s, ser_action);
     }
 
+    template <typename Stream>
+    CMutableTransaction(deserialize_type, Stream& s) {
+        Unserialize(s);
+    }
+
     /** Compute the hash of this CMutableTransaction. This is computed on the
      * fly, as opposed to GetHash() in CTransaction, which uses a cached result.
      */

Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,7 @@ class CTransaction`
`379`	`379`
`380`	`380`	`/** Convert a CMutableTransaction into a CTransaction. */`
`381`	`381`	`CTransaction(const CMutableTransaction &tx);`
	`382`	`+ CTransaction(CMutableTransaction &&tx);`
`382`	`383`
`383`	`384`	`CTransaction& operator=(const CTransaction& tx);`
`384`	`385`
`@@ -392,6 +393,9 @@ class CTransaction`
`392`	`393`	`}`
`393`	`394`	`}`
`394`	`395`
	`396`	`+ template <typename Stream>`
	`397`	`+ CTransaction(deserialize_type, Stream& s) : CTransaction(CMutableTransaction(deserialize, s)) {}`
	`398`	`+`
`395`	`399`	`bool IsNull() const {`
`396`	`400`	`return vin.empty() && vout.empty();`
`397`	`401`	`}`
`@@ -460,6 +464,11 @@ struct CMutableTransaction`
`460`	`464`	`SerializeTransaction(*this, s, ser_action);`
`461`	`465`	`}`
`462`	`466`
	`467`	`+ template <typename Stream>`
	`468`	`+ CMutableTransaction(deserialize_type, Stream& s) {`
	`469`	`+ Unserialize(s);`
	`470`	`+ }`
	`471`	`+`
`463`	`472`	`/** Compute the hash of this CMutableTransaction. This is computed on the`
`464`	`473`	`* fly, as opposed to GetHash() in CTransaction, which uses a cached result.`
`465`	`474`	`*/`