From 7c7944a82c8abd5929bf309a55ac673df7b59a27 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 19 Feb 2013 13:48:46 -0800 Subject: [PATCH] Disambiguate rpcSRC_ACT_NOT_FOUND errors so it's clear when it's the secret that's at fault. --- src/cpp/ripple/RPCErr.cpp | 1 + src/cpp/ripple/RPCErr.h | 1 + src/cpp/ripple/RPCHandler.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cpp/ripple/RPCErr.cpp b/src/cpp/ripple/RPCErr.cpp index 6077f2f8a..9e06a5d9d 100644 --- a/src/cpp/ripple/RPCErr.cpp +++ b/src/cpp/ripple/RPCErr.cpp @@ -60,6 +60,7 @@ Json::Value rpcError(int iError, Json::Value jvResult) { rpcSRC_ACT_MALFORMED, "srcActMalformed", "Source account is malformed." }, { rpcSRC_ACT_MISSING, "srcActMissing", "Source account not provided." }, { rpcSRC_ACT_NOT_FOUND, "srcActNotFound", "Source account not found." }, + { rpcBAD_SECRET, "badSecret", "Secret does not match account." }, { rpcSRC_AMT_MALFORMED, "srcAmtMalformed", "Source amount/currency/issuer is malformed." }, { rpcSRC_CUR_MALFORMED, "srcCurMalformed", "Source currency is malformed." }, { rpcSRC_ISR_MALFORMED, "srcIsrMalformed", "Source issuer is malformed." }, diff --git a/src/cpp/ripple/RPCErr.h b/src/cpp/ripple/RPCErr.h index 611cc5eea..8aa371328 100644 --- a/src/cpp/ripple/RPCErr.h +++ b/src/cpp/ripple/RPCErr.h @@ -67,6 +67,7 @@ enum { rpcSRC_AMT_MALFORMED, rpcSRC_CUR_MALFORMED, rpcSRC_ISR_MALFORMED, + rpcBAD_SECRET, // Internal error (should never happen) rpcINTERNAL, // Generic internal error. diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp index d74cfa013..2fea3c24a 100644 --- a/src/cpp/ripple/RPCHandler.cpp +++ b/src/cpp/ripple/RPCHandler.cpp @@ -251,7 +251,7 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit) if (!bFound) { - return rpcError(rpcSRC_ACT_NOT_FOUND); + return rpcError(rpcBAD_SECRET); } // Use the generator to determine the associated public and private keys.