neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

remove excessive bool arg in dscomplete (#1124)

Browse Source
This commit is contained in:
UdjinM6 2016-11-07 03:27:51 +04:00 committed by GitHub
parent f2d2b25130
commit fef8752cd0
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/darksend.cpp
View File

@ -403,9 +403,8 @@ void CDarksendPool::ProcessMessage(CNode* pfrom, std::string& strCommand, CDataS
} }
int nMsgSessionID; int nMsgSessionID;
bool fMsgError;
int nMsgMessageID; int nMsgMessageID;
vRecv >> nMsgSessionID >> fMsgError >> nMsgMessageID; vRecv >> nMsgSessionID >> nMsgMessageID;
if(nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) { if(nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) {
LogPrint("privatesend", "DSCOMPLETE -- nMsgMessageID is out of bounds: %d\n", nMsgMessageID); LogPrint("privatesend", "DSCOMPLETE -- nMsgMessageID is out of bounds: %d\n", nMsgMessageID);
@ -419,7 +418,7 @@ void CDarksendPool::ProcessMessage(CNode* pfrom, std::string& strCommand, CDataS
LogPrint("privatesend", "DSCOMPLETE -- nMsgSessionID %d nMsgMessageID %d (%s)\n", nMsgSessionID, nMsgMessageID, GetMessageByID(PoolMessage(nMsgMessageID))); LogPrint("privatesend", "DSCOMPLETE -- nMsgSessionID %d nMsgMessageID %d (%s)\n", nMsgSessionID, nMsgMessageID, GetMessageByID(PoolMessage(nMsgMessageID)));
CompletedTransaction(fMsgError, PoolMessage(nMsgMessageID)); CompletedTransaction(PoolMessage(nMsgMessageID));
} }
} }
@ -630,7 +629,7 @@ void CDarksendPool::CommitFinalTransaction()
// not much we can do in this case // not much we can do in this case
SetState(POOL_STATE_ACCEPTING_ENTRIES); SetState(POOL_STATE_ACCEPTING_ENTRIES);
RelayCompletedTransaction(true, ERR_INVALID_TX); RelayCompletedTransaction(ERR_INVALID_TX);
return; return;
} }
} }
@ -650,7 +649,7 @@ void CDarksendPool::CommitFinalTransaction()
RelayInv(inv); RelayInv(inv);
// Tell the clients it was successful // Tell the clients it was successful
RelayCompletedTransaction(false, MSG_SUCCESS); RelayCompletedTransaction(MSG_SUCCESS);
// Randomly charge clients // Randomly charge clients
ChargeRandomFees(); ChargeRandomFees();
@ -1294,27 +1293,18 @@ void CDarksendPool::NewBlock()
} }
// mixing transaction was completed (failed or successful) // mixing transaction was completed (failed or successful)
void CDarksendPool::CompletedTransaction(bool fError, PoolMessage nMessageID) void CDarksendPool::CompletedTransaction(PoolMessage nMessageID)
{ {
if(fMasterNode) return; if(fMasterNode) return;
if(fError) { if(nMessageID == MSG_SUCCESS) {
LogPrintf("CompletedTransaction -- error\n");
SetState(POOL_STATE_ERROR);
CheckPool();
UnlockCoins();
SetNull();
} else {
LogPrintf("CompletedTransaction -- success\n"); LogPrintf("CompletedTransaction -- success\n");
SetState(POOL_STATE_SUCCESS); nCachedLastSuccessBlock = pCurrentBlockIndex->nHeight;
} else {
LogPrintf("CompletedTransaction -- error\n");
}
UnlockCoins(); UnlockCoins();
SetNull(); SetNull();
// To avoid race conditions, we'll only let DS run once per block
nCachedLastSuccessBlock = pCurrentBlockIndex->nHeight;
}
strLastMessage = GetMessageByID(nMessageID); strLastMessage = GetMessageByID(nMessageID);
} }
@ -2417,12 +2407,12 @@ void CDarksendPool::RelayStatus(PoolStatusUpdate nStatusUpdate, PoolMessage nMes
PushStatus(pnode, nStatusUpdate, nMessageID); PushStatus(pnode, nStatusUpdate, nMessageID);
} }
void CDarksendPool::RelayCompletedTransaction(bool fError, PoolMessage nMessageID) void CDarksendPool::RelayCompletedTransaction(PoolMessage nMessageID)
{ {
LOCK(cs_vNodes); LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes) BOOST_FOREACH(CNode* pnode, vNodes)
if(pnode->nVersion >= MIN_PRIVATESEND_PEER_PROTO_VERSION) if(pnode->nVersion >= MIN_PRIVATESEND_PEER_PROTO_VERSION)
pnode->PushMessage(NetMsgType::DSCOMPLETE, nSessionID, fError, (int)nMessageID); pnode->PushMessage(NetMsgType::DSCOMPLETE, nSessionID, (int)nMessageID);
} }
void CDarksendPool::SetState(PoolState nStateNew) void CDarksendPool::SetState(PoolState nStateNew)

4
src/darksend.h
View File

@ -364,7 +364,7 @@ private:
void CreateFinalTransaction(); void CreateFinalTransaction();
void CommitFinalTransaction(); void CommitFinalTransaction();
void CompletedTransaction(bool fError, PoolMessage nMessageID); void CompletedTransaction(PoolMessage nMessageID);
/// Get the denominations for a specific amount of dash. /// Get the denominations for a specific amount of dash.
int GetDenominationsByAmounts(const std::vector<CAmount>& vecAmount); int GetDenominationsByAmounts(const std::vector<CAmount>& vecAmount);
@ -422,7 +422,7 @@ private:
void RelayIn(const CDarkSendEntry& entry); void RelayIn(const CDarkSendEntry& entry);
void PushStatus(CNode* pnode, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID); void PushStatus(CNode* pnode, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID);
void RelayStatus(PoolStatusUpdate nStatusUpdate = STATUS_SET_STATE, PoolMessage nMessageID = MSG_NOERR); void RelayStatus(PoolStatusUpdate nStatusUpdate = STATUS_SET_STATE, PoolMessage nMessageID = MSG_NOERR);
void RelayCompletedTransaction(bool fError, PoolMessage nMessageID); void RelayCompletedTransaction(PoolMessage nMessageID);
public: public:
CMasternode* pSubmittedToMasternode; CMasternode* pSubmittedToMasternode;