From f217217d865cd1a8bb6da7835e5387948c5022d8 Mon Sep 17 00:00:00 2001 From: Pasta Date: Fri, 17 Jan 2020 09:47:02 -0600 Subject: [PATCH] Revert "Merge #11738: Fix sendrawtransaction hang when sending a tx already in mempool" This reverts commit e253240311dece8e8c2c7b8369c9d3dce6ce3c17. --- src/rpc/rawtransaction.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index a558f248ece95..af9dfe43858cc 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -998,10 +998,6 @@ UniValue sendrawtransaction(const JSONRPCRequest& request) } } else if (fHaveChain) { throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain"); - } else { - // Make sure we don't block forever if re-sending - // a transaction already in mempool. - promise.set_value(); } if(!g_connman) throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");