diff --git a/qa/rpc-tests/spentindex.py b/qa/rpc-tests/spentindex.py index 0a3f93e721fcd..c233ca019789d 100755 --- a/qa/rpc-tests/spentindex.py +++ b/qa/rpc-tests/spentindex.py @@ -103,10 +103,6 @@ def run_test(self): assert_equal(txVerbose3["vin"][0]["value"], Decimal(unspent[0]["amount"])) assert_equal(txVerbose3["vin"][0]["valueSat"], amount) - # Check that the input confirmations work for mempool unconfirmed transactions - assert_equal(txVerbose3["vin"][0].has_key("height"), False) - assert_equal(txVerbose3["vin"][0]["confirmations"], 0) - # Check the database index self.nodes[0].generate(1) self.sync_all() @@ -116,10 +112,6 @@ def run_test(self): assert_equal(txVerbose4["vin"][0]["value"], Decimal(unspent[0]["amount"])) assert_equal(txVerbose4["vin"][0]["valueSat"], amount) - # Check that the input confirmations work - assert_equal(txVerbose4["vin"][0]["height"], 107) - assert_equal(txVerbose4["vin"][0]["confirmations"], 1) - print "Passed\n" diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 386cfbcc40287..ee39fbefd6254 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -83,13 +83,6 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry) CSpentIndexValue spentInfo; CSpentIndexKey spentKey(txin.prevout.hash, txin.prevout.n); if (GetSpentIndex(spentKey, spentInfo)) { - // Unconfirmed spentInfo have a height of -1, block 0 is unspendable - if (spentInfo.blockHeight > 0) { - in.push_back(Pair("height", spentInfo.blockHeight)); - in.push_back(Pair("confirmations", 1 + chainActive.Height() - spentInfo.blockHeight)); - } else { - in.push_back(Pair("confirmations", 0)); - } in.push_back(Pair("value", ValueFromAmount(spentInfo.satoshis))); in.push_back(Pair("valueSat", spentInfo.satoshis)); if (spentInfo.addressType == 1) {