RPC: merge gettransaction output format fixes

alex · alex · commit 712447ffd453 · 2013-11-06T21:12:28.000+04:00
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -1291,7 +1291,6 @@ Value gettransaction(const Array& params, bool fHelp)
         uint256 hashBlock = 0;
         if (GetTransaction(hash, tx, hashBlock))
         {
-            entry.push_back(Pair("txid", hash.GetHex()));
             TxToJSON(tx, 0, entry);
             if (hashBlock == 0)
                 entry.push_back(Pair("confirmations", 0));
@@ -1303,11 +1302,7 @@ Value gettransaction(const Array& params, bool fHelp)
                 {
                     CBlockIndex* pindex = (*mi).second;
                     if (pindex->IsInMainChain())
-                    {
                         entry.push_back(Pair("confirmations", 1 + nBestHeight - pindex->nHeight));
-                        entry.push_back(Pair("txntime", (boost::int64_t)tx.nTime));
-                        entry.push_back(Pair("time", (boost::int64_t)pindex->nTime));
-                    }
                     else
                         entry.push_back(Pair("confirmations", 0));
                 }

Original file line number	Diff line number	Diff line change
`@@ -1291,7 +1291,6 @@ Value gettransaction(const Array& params, bool fHelp)`
`1291`	`1291`	`uint256 hashBlock = 0;`
`1292`	`1292`	`if (GetTransaction(hash, tx, hashBlock))`
`1293`	`1293`	`{`
`1294`		`- entry.push_back(Pair("txid", hash.GetHex()));`
`1295`	`1294`	`TxToJSON(tx, 0, entry);`
`1296`	`1295`	`if (hashBlock == 0)`
`1297`	`1296`	`entry.push_back(Pair("confirmations", 0));`
`@@ -1303,11 +1302,7 @@ Value gettransaction(const Array& params, bool fHelp)`
`1303`	`1302`	`{`
`1304`	`1303`	`CBlockIndex* pindex = (*mi).second;`
`1305`	`1304`	`if (pindex->IsInMainChain())`
`1306`		`- {`
`1307`	`1305`	`entry.push_back(Pair("confirmations", 1 + nBestHeight - pindex->nHeight));`
`1308`		`- entry.push_back(Pair("txntime", (boost::int64_t)tx.nTime));`
`1309`		`- entry.push_back(Pair("time", (boost::int64_t)pindex->nTime));`
`1310`		`- }`
`1311`	`1306`	`else`
`1312`	`1307`	`entry.push_back(Pair("confirmations", 0));`
`1313`	`1308`	`}`