DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2018-07-23 03:56:57 -11:00
parent 27db9f401c
commit fc40b06c94
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/eval.cpp
View File

@@ -90,8 +90,8 @@ bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &h
{ {
bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock); bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock);
// there is a LOCK(cs_main) in the normal GetTransaction(), which leads to deadlocks // there is a LOCK(cs_main) in the normal GetTransaction(), which leads to deadlocks
bool fAllowSlow = false; // Don't allow slow //bool fAllowSlow = false; // Don't allow slow
return GetTransaction(hash, txOut, hashBlock, fAllowSlow); //return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
return myGetTransaction(hash, txOut,hashBlock); return myGetTransaction(hash, txOut,hashBlock);
} }

6
src/main.cpp
View File

@@ -1606,13 +1606,13 @@ bool GetAddressUnspent(uint160 addressHash, int type,
bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock)
{ {
// need a GetTransaction without lock so the validation code for assets can run without deadlock // 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)) if (mempool.lookup(hash, txOut))
{ {
//fprintf(stderr,"found in mempool\n"); fprintf(stderr,"found in mempool\n");
return true; return true;
} }
//fprintf(stderr,"check disk\n"); fprintf(stderr,"check disk\n");
if (fTxIndex) { if (fTxIndex) {
CDiskTxPos postx; CDiskTxPos postx;