From 765380cf3566564a72b64d9652401747089daa25 Mon Sep 17 00:00:00 2001
From: lateminer <late-miner@ya.ru>
Date: Mon, 8 Jan 2018 22:35:33 +0300
Subject: [PATCH] Revert "Make RelayWalletTransaction attempt to
 AcceptToMemoryPool."

This reverts commit c1a012803363b10296f7bcd1ddd9c512df77ca1c.
---
 src/wallet/wallet.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4642df3d4..bd8b19330 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1800,11 +1800,9 @@ void CWallet::ReacceptWalletTransactions()
 bool CWalletTx::RelayWalletTransaction()
 {
     assert(pwallet->GetBroadcastTransactions());
-    if (!IsCoinBase() && !IsCoinStake() && !isAbandoned() && GetDepthInMainChain() == 0)
+    if (!IsCoinBase() && !IsCoinStake())
     {
-        CValidationState state;
-        /* GetDepthInMainChain already catches known conflicts. */
-        if (InMempool() || AcceptToMemoryPool(maxTxFee, state)) {
+        if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) {
             LogPrintf("Relaying wtx %s\n", GetHash().ToString());
             RelayTransaction((CTransaction)*this);
             return true;