sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename UpdatePoolStateOnClient to CheckPoolStateUpdate

Browse Source
This commit is contained in:
UdjinM6 2016-11-11 11:28:35 +03:00
parent 6695a43b4a
commit 643798b5a9
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/darksend.cpp
View File

@ -312,13 +312,14 @@ void CDarksendPool::ProcessMessage(CNode* pfrom, std::string& strCommand, CDataS
if(nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) { if(nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) {
LogPrint("privatesend", "DSSTATUSUPDATE -- nMsgMessageID is out of bounds: %d\n", nMsgMessageID); LogPrint("privatesend", "DSSTATUSUPDATE -- nMsgMessageID is out of bounds: %d\n", nMsgMessageID);
if(pfrom->nVersion < 70203) nMsgMessageID = MSG_NOERR;
return; return;
} }
LogPrint("privatesend", "DSSTATUSUPDATE -- GetMessageByID: %s\n", GetMessageByID(PoolMessage(nMsgMessageID))); LogPrint("privatesend", "DSSTATUSUPDATE -- GetMessageByID: %s\n", GetMessageByID(PoolMessage(nMsgMessageID)));
if(!UpdatePoolStateOnClient(PoolState(nMsgState), nMsgEntriesCount, PoolStatusUpdate(nMsgStatusUpdate), PoolMessage(nMsgMessageID), nMsgSessionID)) { if(!CheckPoolStateUpdate(PoolState(nMsgState), nMsgEntriesCount, PoolStatusUpdate(nMsgStatusUpdate), PoolMessage(nMsgMessageID), nMsgSessionID)) {
LogPrint("privatesend", "DSSTATUSUPDATE -- can't update local state\n"); LogPrint("privatesend", "DSSTATUSUPDATE -- CheckPoolStateUpdate failed\n");
} }
} else if(strCommand == NetMsgType::DSSIGNFINALTX) { } else if(strCommand == NetMsgType::DSSIGNFINALTX) {
@ -1096,7 +1097,7 @@ bool CDarksendPool::SendDenominate(const std::vector<CTxIn>& vecTxIn, const std:
} }
// Incoming message from Masternode updating the progress of mixing // Incoming message from Masternode updating the progress of mixing
bool CDarksendPool::UpdatePoolStateOnClient(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew) bool CDarksendPool::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew)
{ {
if(fMasterNode) return false; if(fMasterNode) return false;
@ -1107,7 +1108,7 @@ bool CDarksendPool::UpdatePoolStateOnClient(PoolState nStateNew, int nEntriesCou
// if rejected at any state // if rejected at any state
if(nStatusUpdate == STATUS_REJECTED) { if(nStatusUpdate == STATUS_REJECTED) {
LogPrintf("CDarksendPool::UpdatePoolStateOnClient -- entry is rejected by Masternode\n"); LogPrintf("CDarksendPool::CheckPoolStateUpdate -- entry is rejected by Masternode\n");
UnlockCoins(); UnlockCoins();
SetNull(); SetNull();
SetState(POOL_STATE_ERROR); SetState(POOL_STATE_ERROR);
@ -1120,14 +1121,14 @@ bool CDarksendPool::UpdatePoolStateOnClient(PoolState nStateNew, int nEntriesCou
// new session id should be set only in POOL_STATE_QUEUE state // new session id should be set only in POOL_STATE_QUEUE state
nSessionID = nSessionIDNew; nSessionID = nSessionIDNew;
nTimeLastSuccessfulStep = GetTimeMillis(); nTimeLastSuccessfulStep = GetTimeMillis();
LogPrintf("CDarksendPool::UpdatePoolStateOnClient -- set nSessionID to %d\n", nSessionID); LogPrintf("CDarksendPool::CheckPoolStateUpdate -- set nSessionID to %d\n", nSessionID);
return true; return true;
} }
else if(nStateNew == POOL_STATE_ACCEPTING_ENTRIES && nEntriesCount != nEntriesCountNew) { else if(nStateNew == POOL_STATE_ACCEPTING_ENTRIES && nEntriesCount != nEntriesCountNew) {
nEntriesCount = nEntriesCountNew; nEntriesCount = nEntriesCountNew;
nTimeLastSuccessfulStep = GetTimeMillis(); nTimeLastSuccessfulStep = GetTimeMillis();
fLastEntryAccepted = true; fLastEntryAccepted = true;
LogPrintf("CDarksendPool::UpdatePoolStateOnClient -- new entry accepted!\n"); LogPrintf("CDarksendPool::CheckPoolStateUpdate -- new entry accepted!\n");
return true; return true;
} }
} }

2
src/darksend.h
View File

@ -395,7 +395,7 @@ private:
bool SendDenominate(const std::vector<CTxIn>& vecTxIn, const std::vector<CTxOut>& vecTxOut); bool SendDenominate(const std::vector<CTxIn>& vecTxIn, const std::vector<CTxOut>& vecTxOut);
/// Get Masternode updates about the progress of mixing /// Get Masternode updates about the progress of mixing
bool UpdatePoolStateOnClient(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew=0); bool CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew=0);
// Set the 'state' value, with some logging and capturing when the state changed // Set the 'state' value, with some logging and capturing when the state changed
void SetState(PoolState nStateNew); void SetState(PoolState nStateNew);