Revert "Merge bitcoin#11738: Fix sendrawtransaction hang when sending…

… a tx already in mempool" This reverts commit e253240.
PastaPastaPasta · Jan 17, 2020 · f217217 · f217217
1 parent c9d771d
commit f217217
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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");