diff --git a/src/Peer.cpp b/src/Peer.cpp index ca70226ade..35da711dad 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -674,7 +674,7 @@ void Peer::recvTransaction(newcoin::TMTransaction& packet) #ifdef DEBUG std::cerr << "Transaction from peer fails validity tests" << std::endl; Json::StyledStreamWriter w; - w.write(std::cerr, tx->getJson(true)); + w.write(std::cerr, tx->getJson(0)); #endif return; } diff --git a/src/Transaction.cpp b/src/Transaction.cpp index 8baaa0a334..1cc4e8e304 100644 --- a/src/Transaction.cpp +++ b/src/Transaction.cpp @@ -637,12 +637,11 @@ bool Transaction::convertToTransactions(uint32 firstLedgerSeq, uint32 secondLedg return true; } -Json::Value Transaction::getJson(bool decorate, bool paid, bool credited) const +Json::Value Transaction::getJson(int options) const { Json::Value ret(mTransaction->getJson(0)); if (mInLedger) ret["inLedger"]=mInLedger; - if (paid) ret["paid"]=true; switch(mStatus) { @@ -658,16 +657,6 @@ Json::Value Transaction::getJson(bool decorate, bool paid, bool credited) const default: ret["status"] = "unknown"; } -#if 0 - if(decorate) - { - LocalAccount::pointer lac = theApp->getWallet().getLocalAccount(mAccountFrom); - if (!!lac) source = lac->getJson(); - lac = theApp->getWallet().getLocalAccount(mAccountTo); - if (!!lac) destination = lac->getJson(); - } -#endif - return ret; } diff --git a/src/Transaction.h b/src/Transaction.h index c87b18d19d..2f34f1b20c 100644 --- a/src/Transaction.h +++ b/src/Transaction.h @@ -268,7 +268,7 @@ public: bool operator<=(const Transaction&) const; bool operator>=(const Transaction&) const; - Json::Value getJson(bool decorate, bool paid_local=false, bool credited_local=false) const; + Json::Value getJson(int options) const; static bool isHexTxID(const std::string&);