From fc40b06c944f0d057282787da6e914f2161344c0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 23 Jul 2018 03:56:57 -1100 Subject: [PATCH] Test --- src/cc/eval.cpp | 4 ++-- src/main.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp index 401d12e3e..97bb89402 100644 --- a/src/cc/eval.cpp +++ b/src/cc/eval.cpp @@ -90,8 +90,8 @@ bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &h { bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock); // there is a LOCK(cs_main) in the normal GetTransaction(), which leads to deadlocks - bool fAllowSlow = false; // Don't allow slow - return GetTransaction(hash, txOut, hashBlock, fAllowSlow); + //bool fAllowSlow = false; // Don't allow slow + //return GetTransaction(hash, txOut, hashBlock, fAllowSlow); return myGetTransaction(hash, txOut,hashBlock); } diff --git a/src/main.cpp b/src/main.cpp index 913807ba9..dfc47c605 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1606,13 +1606,13 @@ bool GetAddressUnspent(uint160 addressHash, int type, bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) { // need a GetTransaction without lock so the validation code for assets can run without deadlock - //fprintf(stderr,"check mempool\n"); + fprintf(stderr,"check mempool\n"); if (mempool.lookup(hash, txOut)) { - //fprintf(stderr,"found in mempool\n"); + fprintf(stderr,"found in mempool\n"); return true; } - //fprintf(stderr,"check disk\n"); + fprintf(stderr,"check disk\n"); if (fTxIndex) { CDiskTxPos postx;