Make CWalletTx store a CTransactionRef instead of inheriting

2016-11-11 16:54:51 -08:00
parent a1883536b4
commit c3f5673a63
12 changed files with 128 additions and 123 deletions
@@ -271,7 +271,7 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
    if (!DecodeHexTx(tx, request.params[0].get_str()))
        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
    uint256 hashTx = tx.GetHash();
-    CWalletTx wtx(pwalletMain,tx);
+    CWalletTx wtx(pwalletMain, MakeTransactionRef(std::move(tx)));

    CDataStream ssMB(ParseHexV(request.params[1], "proof"), SER_NETWORK, PROTOCOL_VERSION);
    CMerkleBlock merkleBlock;