diff options
| author | Karl-Johan Alm <[email protected]> | 2017-05-09 15:46:26 +0900 |
|---|---|---|
| committer | Karl-Johan Alm <[email protected]> | 2017-05-09 15:46:26 +0900 |
| commit | 5a5e4e9cc19e30186ba0a15a1cf892516d419baf (patch) | |
| tree | dd937f14c45ed899f4af1d0c941705e0e10cd38a /src/wallet/rpcwallet.cpp | |
| parent | Merge #10342: [tests] Improve mempool_persist test (diff) | |
| download | discoin-5a5e4e9cc19e30186ba0a15a1cf892516d419baf.tar.xz discoin-5a5e4e9cc19e30186ba0a15a1cf892516d419baf.zip | |
[wallet] Remove CTransaction&() helper conversion operator from wallet implementation.
Diffstat (limited to 'src/wallet/rpcwallet.cpp')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index d1e7485d0..bfd006c14 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -87,7 +87,7 @@ void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry) std::string rbfStatus = "no"; if (confirms <= 0) { LOCK(mempool.cs); - RBFTransactionState rbfState = IsRBFOptIn(wtx, mempool); + RBFTransactionState rbfState = IsRBFOptIn(*wtx.tx, mempool); if (rbfState == RBF_TRANSACTIONSTATE_UNKNOWN) rbfStatus = "unknown"; else if (rbfState == RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125) @@ -1867,7 +1867,7 @@ UniValue gettransaction(const JSONRPCRequest& request) ListTransactions(pwallet, wtx, "*", 0, false, details, filter); entry.push_back(Pair("details", details)); - std::string strHex = EncodeHexTx(static_cast<CTransaction>(wtx), RPCSerializationFlags()); + std::string strHex = EncodeHexTx(*wtx.tx, RPCSerializationFlags()); entry.push_back(Pair("hex", strHex)); return entry; |