Make error messages re payload a bit more specific

dashpay · Nov 14, 2018 · 658b7af · 658b7af
1 parent 153afb9
commit 658b7af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
@@ -655,7 +655,7 @@ def test_fail_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        assert_raises_jsonrpc(None, "bad-tx-type-dip3", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
 
     def test_success_create_protx(self, node):
         address = node.getnewaddress()

diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
@@ -20,7 +20,7 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidatio
 
     CCbTx cbTx;
     if (!GetTxPayload(tx, cbTx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-payload");
     }
 
     if (cbTx.nVersion > CCbTx::CURRENT_VERSION) {
@@ -45,7 +45,7 @@ bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, C
 
     CCbTx cbTx;
     if (!GetTxPayload(*block.vtx[0], cbTx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-payload");
     }
 
     if (pindex) {

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
@@ -80,7 +80,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     CProRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
@@ -207,7 +207,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
 
     CProUpServTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
@@ -259,7 +259,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
     CProUpRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
@@ -335,7 +335,7 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
     CProUpRevTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {

diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
@@ -38,7 +38,7 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
         return CheckCbTx(tx, pindexPrev, state);
     }
 
-    return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
+    return state.DoS(10, false, REJECT_INVALID, "bad-tx-type-check");
 }
 
 bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state)
@@ -57,7 +57,7 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
         return true; // nothing to do
     }
 
-    return state.DoS(100, false, REJECT_INVALID, "bad-tx-type");
+    return state.DoS(100, false, REJECT_INVALID, "bad-tx-type-proc");
 }
 
 bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)