From a1424fcd60c53f2d172da9b75b0f4fdf78387bf9 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Tue, 10 Jul 2012 13:16:08 -0700 Subject: [PATCH] Fix error class for terBAD_AUTH_MASTER. --- src/TransactionEngine.cpp | 4 ++-- src/TransactionEngine.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index 448e0ecbf8..fe667feffa 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -26,7 +26,6 @@ bool transResultInfo(TransactionEngineResult terCode, std::string& strToken, std } transResultInfoA[] = { { tenBAD_ADD_AUTH, "tenBAD_ADD_AUTH", "Not authorized to add account." }, { tenBAD_AMOUNT, "tenBAD_AMOUNT", "Can only send positive amounts." }, - { tenBAD_AUTH_MASTER, "tenBAD_AUTH_MASTER", "Auth for unclaimed account needs correct master key." }, { tenBAD_CLAIM_ID, "tenBAD_CLAIM_ID", "Malformed." }, { tenBAD_EXPIRATION, "tenBAD_EXPIRATION", "Malformed." }, { tenBAD_GEN_AUTH, "tenBAD_GEN_AUTH", "Not authorized to claim generator." }, @@ -51,6 +50,7 @@ bool transResultInfo(TransactionEngineResult terCode, std::string& strToken, std { tenUNKNOWN, "tenUNKNOWN", "The transactions requires logic not implemented yet" }, { terALREADY, "terALREADY", "The exact transaction was already in this ledger" }, { terBAD_AUTH, "terBAD_AUTH", "Transaction's public key is not authorized." }, + { terBAD_AUTH_MASTER, "terBAD_AUTH_MASTER", "Auth for unclaimed account needs correct master key." }, { terBAD_LEDGER, "terBAD_LEDGER", "Ledger in unexpected state." }, { terBAD_RIPPLE, "terBAD_RIPPLE", "No ripple path can be satisfied." }, { terBAD_SEQ, "terBAD_SEQ", "This sequence number should be zero for prepaid transactions." }, @@ -695,7 +695,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran { std::cerr << "applyTransaction: Invalid: Not authorized to use account." << std::endl; - result = tenBAD_AUTH_MASTER; + result = terBAD_AUTH_MASTER; } break; } diff --git a/src/TransactionEngine.h b/src/TransactionEngine.h index d8dec7e466..36427747fb 100644 --- a/src/TransactionEngine.h +++ b/src/TransactionEngine.h @@ -33,7 +33,6 @@ enum TransactionEngineResult // Invalid: Ledger won't allow. tenCLAIMED = -200, - tenBAD_AUTH_MASTER, tenBAD_RIPPLE, tenCREATED, tenEXPIRED, @@ -52,6 +51,7 @@ enum TransactionEngineResult // Conflict with ledger database: Fee claimed // Might succeed if not conflict is not caused by transaction ordering. terBAD_AUTH, + terBAD_AUTH_MASTER, terBAD_LEDGER, terBAD_RIPPLE, terBAD_SEQ,