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

Remove watchdogs from existence (#2816)

Browse Source
This commit is contained in:
Nathan Marley 2019-03-30 11:55:20 -03:00 committed by UdjinM6
parent bfc288afb4
commit 74d999e568
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/governance-object.cpp
View File

@ -454,10 +454,6 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
}
switch (nObjectType) {
case GOVERNANCE_OBJECT_WATCHDOG: {
// watchdogs are deprecated
return false;
}
case GOVERNANCE_OBJECT_PROPOSAL: {
CProposalValidator validator(GetDataAsHexString(), true);
// Note: It's ok to have expired proposals
@ -519,8 +515,6 @@ CAmount CGovernanceObject::GetMinCollateralFee() const
return GOVERNANCE_PROPOSAL_FEE_TX;
case GOVERNANCE_OBJECT_TRIGGER:
return 0;
case GOVERNANCE_OBJECT_WATCHDOG:
return 0;
default:
return MAX_MONEY;
}

1
src/governance-object.h
View File

@ -31,7 +31,6 @@ static const double GOVERNANCE_FILTER_FP_RATE = 0.001;
static const int GOVERNANCE_OBJECT_UNKNOWN = 0;
static const int GOVERNANCE_OBJECT_PROPOSAL = 1;
static const int GOVERNANCE_OBJECT_TRIGGER = 2;
static const int GOVERNANCE_OBJECT_WATCHDOG = 3;
static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (5.0 * COIN);

8
src/rpc/governance.cpp
View File

@ -184,10 +184,6 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Trigger objects need not be prepared (however only masternodes can create them)");
}
if (govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
}
LOCK2(cs_main, pwallet->cs_wallet);
std::string strError = "";
@ -294,10 +290,6 @@ UniValue gobject_submit(const JSONRPCRequest& request)
}
}
if (govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
}
// Attempt to sign triggers if we are a MN
if (govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
if (fMnFound) {