New class RPC::Status enforces JSON-RPC 2.0 error format.

* Relevant issues:
  * RIPD-92
  * RIPD-97
  * RIPD-98
  * RIPD-439
This commit is contained in:
Tom Ritchford
2014-09-30 20:11:23 -04:00
parent fc560179e0
commit afc102e90a
7 changed files with 436 additions and 0 deletions

View File

@@ -0,0 +1,77 @@
//------------------------------------------------------------------------------
/*
This file is part of rippled: https://github.com/ripple/rippled
Copyright (c) 2012, 2013 Ripple Labs Inc.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
#include <ripple/rpc/Status.h>
namespace ripple {
namespace RPC {
namespace New {
std::string Status::codeString () const
{
if (!*this)
return "";
if (type_ == Type::none)
return std::to_string (code_);
if (type_ == Status::Type::TER)
{
std::string s1, s2;
auto success = transResultInfo (toTER (), s1, s2);
assert (success);
(void) success;
return s1 + ": " + s2;
}
if (type_ == Status::Type::error_code_i)
{
auto info = get_error_info (toErrorCode ());
return info.token + ": " + info.message;
}
assert (false);
return "";
}
void Status::fillJson (Json::Value& value)
{
static const std::string separator = ": ";
if (!*this)
return;
auto& error = value[jss::error];
error[jss::code] = code_;
error[jss::message] = codeString ();
// Are there any more messages?
if (!messages_.empty ())
{
auto& messages = error[jss::data];
for (auto& i: messages_)
messages.append (i);
}
}
} // namespace New
} // namespace RPC
} // ripple