From 82dcb03e353099d313269c74c81ce88c3e41751c Mon Sep 17 00:00:00 2001 From: Pasta Date: Fri, 5 Jul 2019 12:34:38 -0500 Subject: [PATCH] REJECT_CONFLICT -> REJECT_DUPLICATE Signed-off-by: Pasta --- src/evo/deterministicmns.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp index 921905e1a..393219d06 100644 --- a/src/evo/deterministicmns.cpp +++ b/src/evo/deterministicmns.cpp @@ -692,10 +692,10 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C } if (newList.HasUniqueProperty(proTx.addr)) { - return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr"); + return _state.DoS(100, false, REJECT_DUPLICATE, "bad-protx-dup-addr"); } if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.pubKeyOperator)) { - return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-key"); + return _state.DoS(100, false, REJECT_DUPLICATE, "bad-protx-dup-key"); } dmn->nOperatorReward = proTx.nOperatorReward; @@ -724,7 +724,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C } if (newList.HasUniqueProperty(proTx.addr) && newList.GetUniquePropertyMN(proTx.addr)->proTxHash != proTx.proTxHash) { - return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr"); + return _state.DoS(100, false, REJECT_DUPLICATE, "bad-protx-dup-addr"); } CDeterministicMNCPtr dmn = newList.GetMN(proTx.proTxHash);