Merge #16217: getrawtransaction: inform about blockhash argument when lookup fails

MarcoFalke · MarcoFalke · commit fce4123242c4 · 2019-06-17T10:15:18.000-04:00
c59e3a3 getrawtransaction: inform about blockhash argument when lookup fails (darosior) Pull request description: Just 4 words added on `getrawtransaction` lookup error to fix #16142 ACKs for commit c59e3a: Tree-SHA512: 2219099c1240667527a9b1498a58818b5ff1c2ef366c498d2bb57963e828b3c87fa3e6b94be7e6463bd289ceabc13f9c9b1082134641594ba335ac400e6d63aa
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -196,7 +196,7 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)
             }
             errmsg = "No such transaction found in the provided block";
         } else if (!g_txindex) {
-            errmsg = "No such mempool transaction. Use -txindex to enable blockchain transaction queries";
+            errmsg = "No such mempool transaction. Use -txindex or provide a block hash to enable blockchain transaction queries";
         } else if (!f_txindex_ready) {
             errmsg = "No such mempool transaction. Blockchain transactions are still in the process of being indexed";
         } else {

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)`
`196`	`196`	`}`
`197`	`197`	`errmsg = "No such transaction found in the provided block";`
`198`	`198`	`} else if (!g_txindex) {`
`199`		`- errmsg = "No such mempool transaction. Use -txindex to enable blockchain transaction queries";`
	`199`	`+ errmsg = "No such mempool transaction. Use -txindex or provide a block hash to enable blockchain transaction queries";`
`200`	`200`	`} else if (!f_txindex_ready) {`
`201`	`201`	`errmsg = "No such mempool transaction. Blockchain transactions are still in the process of being indexed";`
`202`	`202`	`} else {`