From 2b101c628c46fd4182cf0acae3c8d3f56d72ff3b Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Tue, 21 Jan 2020 16:56:08 +0100 Subject: [PATCH] Remove backported traces of RPCSerializationFlags We don't have this in Dash --- src/core_io.h | 2 +- src/core_write.cpp | 2 +- src/rpc/blockchain.cpp | 2 +- src/rpc/rawtransaction.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core_io.h b/src/core_io.h index 59fa36394eb181..a509fc56a86e10 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -33,6 +33,6 @@ UniValue ValueFromAmount(const CAmount& amount); std::string FormatScript(const CScript& script); std::string EncodeHexTx(const CTransaction& tx); void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex); -void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CSpentIndexTxInfo* ptxSpentInfo = nullptr); +void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, const CSpentIndexTxInfo* ptxSpentInfo = nullptr); #endif // BITCOIN_CORE_IO_H diff --git a/src/core_write.cpp b/src/core_write.cpp index f2fc96942ef9ec..9b6ccbe6dc42ce 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -159,7 +159,7 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey, out.pushKV("addresses", a); } -void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex, int serialize_flags, const CSpentIndexTxInfo* ptxSpentInfo) +void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex, const CSpentIndexTxInfo* ptxSpentInfo) { uint256 txid = tx.GetHash(); entry.pushKV("txid", txid.GetHex()); diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index d620fe70256181..134a21d1751c1c 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -138,7 +138,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx if(txDetails) { UniValue objTx(UniValue::VOBJ); - TxToUniv(*tx, uint256(), objTx, true, RPCSerializationFlags()); + TxToUniv(*tx, uint256(), objTx, true); bool fLocked = llmq::quorumInstantSendManager->IsLocked(tx->GetHash()); objTx.push_back(Pair("instantlock", fLocked || chainLock)); objTx.push_back(Pair("instantlock_internal", fLocked)); diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index ec1059731f7e4b..b9a6e3482ada7e 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -72,7 +72,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry) } } - TxToUniv(tx, uint256(), entry, true, RPCSerializationFlags(), &txSpentInfo); + TxToUniv(tx, uint256(), entry, true, &txSpentInfo); bool chainLock = false; if (!hashBlock.IsNull()) { @@ -205,7 +205,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request) ". Use gettransaction for wallet transactions."); if (!fVerbose) - return EncodeHexTx(*tx, RPCSerializationFlags()); + return EncodeHexTx(*tx); UniValue result(UniValue::VOBJ); TxToJSON(*tx, hashBlock, result);