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

fix: Fix trivial validation typo and test (#5465)

Browse Source 
## Issue being fixed or feature implemented
`GetVersion` expects `is_basic_scheme_active`, not
`is_bls_legacy_scheme`

## What was done?
see commits

## How Has This Been Tested?
`make check`

## Breaking Changes
luckily only tests are affected

## Checklist:
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
This commit is contained in:
UdjinM6 2023-06-29 20:12:31 +03:00 committed by GitHub
parent 13d8f4160f
commit 1bd4449466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/evo/providertx.cpp
View File

@ -11,9 +11,9 @@
#include <script/standard.h> #include <script/standard.h>
#include <util/underlying.h> #include <util/underlying.h>
bool CProRegTx::IsTriviallyValid(bool is_bls_legacy_scheme, TxValidationState& state) const bool CProRegTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const
{ {
if (nVersion == 0 || nVersion > GetVersion(is_bls_legacy_scheme)) { if (nVersion == 0 || nVersion > GetVersion(is_basic_scheme_active)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version"); return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version");
} }
if (!IsValidMnType(nType)) { if (!IsValidMnType(nType)) {
@ -87,9 +87,9 @@ std::string CProRegTx::ToString() const
nVersion, ToUnderlying(nType), collateralOutpoint.ToStringShort(), addr.ToString(), (double)nOperatorReward / 100, EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), payee, platformNodeID.ToString(), platformP2PPort, platformHTTPPort); nVersion, ToUnderlying(nType), collateralOutpoint.ToStringShort(), addr.ToString(), (double)nOperatorReward / 100, EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), payee, platformNodeID.ToString(), platformP2PPort, platformHTTPPort);
} }
bool CProUpServTx::IsTriviallyValid(bool is_bls_legacy_scheme, TxValidationState& state) const bool CProUpServTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const
{ {
if (nVersion == 0 || nVersion > GetVersion(is_bls_legacy_scheme)) { if (nVersion == 0 || nVersion > GetVersion(is_basic_scheme_active)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version"); return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version");
} }
@ -108,9 +108,9 @@ std::string CProUpServTx::ToString() const
nVersion, ToUnderlying(nType), proTxHash.ToString(), addr.ToString(), payee, platformNodeID.ToString(), platformP2PPort, platformHTTPPort); nVersion, ToUnderlying(nType), proTxHash.ToString(), addr.ToString(), payee, platformNodeID.ToString(), platformP2PPort, platformHTTPPort);
} }
bool CProUpRegTx::IsTriviallyValid(bool is_bls_legacy_scheme, TxValidationState& state) const bool CProUpRegTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const
{ {
if (nVersion == 0 || nVersion > GetVersion(is_bls_legacy_scheme)) { if (nVersion == 0 || nVersion > GetVersion(is_basic_scheme_active)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version"); return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version");
} }
if (nMode != 0) { if (nMode != 0) {
@ -141,9 +141,9 @@ std::string CProUpRegTx::ToString() const
nVersion, proTxHash.ToString(), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), payee); nVersion, proTxHash.ToString(), pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), payee);
} }
bool CProUpRevTx::IsTriviallyValid(bool is_bls_legacy_scheme, TxValidationState& state) const bool CProUpRevTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const
{ {
if (nVersion == 0 || nVersion > GetVersion(is_bls_legacy_scheme)) { if (nVersion == 0 || nVersion > GetVersion(is_basic_scheme_active)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version"); return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version");
} }

16
src/test/evo_trivialvalidation.cpp
View File

@ -49,28 +49,28 @@ BOOST_AUTO_TEST_CASE(trivialvalidation_valid)
BOOST_CHECK_EQUAL(txType, "proregtx"); BOOST_CHECK_EQUAL(txType, "proregtx");
CProRegTx ptx; CProRegTx ptx;
BOOST_CHECK(GetTxPayload(tx, ptx, false)); BOOST_CHECK(GetTxPayload(tx, ptx, false));
BOOST_CHECK(ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
break; break;
} }
case TRANSACTION_PROVIDER_UPDATE_SERVICE: { case TRANSACTION_PROVIDER_UPDATE_SERVICE: {
BOOST_CHECK_EQUAL(txType, "proupservtx"); BOOST_CHECK_EQUAL(txType, "proupservtx");
CProUpServTx ptx; CProUpServTx ptx;
BOOST_CHECK(GetTxPayload(tx, ptx, false)); BOOST_CHECK(GetTxPayload(tx, ptx, false));
BOOST_CHECK(ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
break; break;
} }
case TRANSACTION_PROVIDER_UPDATE_REGISTRAR: { case TRANSACTION_PROVIDER_UPDATE_REGISTRAR: {
BOOST_CHECK_EQUAL(txType, "proupregtx"); BOOST_CHECK_EQUAL(txType, "proupregtx");
CProUpRegTx ptx; CProUpRegTx ptx;
BOOST_CHECK(GetTxPayload(tx, ptx, false)); BOOST_CHECK(GetTxPayload(tx, ptx, false));
BOOST_CHECK(ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
break; break;
} }
case TRANSACTION_PROVIDER_UPDATE_REVOKE: { case TRANSACTION_PROVIDER_UPDATE_REVOKE: {
BOOST_CHECK_EQUAL(txType, "prouprevtx"); BOOST_CHECK_EQUAL(txType, "prouprevtx");
CProUpRevTx ptx; CProUpRevTx ptx;
BOOST_CHECK(GetTxPayload(tx, ptx, false)); BOOST_CHECK(GetTxPayload(tx, ptx, false));
BOOST_CHECK(ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
break; break;
} }
default: default:
@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(trivialvalidation_invalid)
if (txType == "proregtx") { if (txType == "proregtx") {
CProRegTx ptx; CProRegTx ptx;
if (GetTxPayload(tx, ptx, false)) { if (GetTxPayload(tx, ptx, false)) {
BOOST_CHECK(!ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(!ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
} else { } else {
BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_REGISTER || ptx.nVersion == 0); BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_REGISTER || ptx.nVersion == 0);
} }
@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE(trivialvalidation_invalid)
else if (txType == "proupservtx") { else if (txType == "proupservtx") {
CProUpServTx ptx; CProUpServTx ptx;
if (GetTxPayload(tx, ptx, false)) { if (GetTxPayload(tx, ptx, false)) {
BOOST_CHECK(!ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(!ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
} else { } else {
BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE || ptx.nVersion == 0); BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE || ptx.nVersion == 0);
} }
@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE(trivialvalidation_invalid)
else if (txType == "proupregtx") { else if (txType == "proupregtx") {
CProUpRegTx ptx; CProUpRegTx ptx;
if (GetTxPayload(tx, ptx, false)) { if (GetTxPayload(tx, ptx, false)) {
BOOST_CHECK(!ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(!ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
} }
else { else {
BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR || ptx.nVersion == 0); BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR || ptx.nVersion == 0);
@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(trivialvalidation_invalid)
else if (txType == "prouprevtx") { else if (txType == "prouprevtx") {
CProUpRevTx ptx; CProUpRevTx ptx;
if (GetTxPayload(tx, ptx, false)) { if (GetTxPayload(tx, ptx, false)) {
BOOST_CHECK(!ptx.IsTriviallyValid(bls::bls_legacy_scheme.load(), dummy_state)); BOOST_CHECK(!ptx.IsTriviallyValid(!bls::bls_legacy_scheme.load(), dummy_state));
} else { } else {
BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_UPDATE_REVOKE || ptx.nVersion == 0); BOOST_CHECK(tx.nType != TRANSACTION_PROVIDER_UPDATE_REVOKE || ptx.nVersion == 0);
} }