dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Support both nano_ and rai_ prefixes for unit conversion RPCs (#1719)

Browse source
This commit is contained in:
Sergey Kroshnin 2019-02-12 22:42:00 +03:00 • committed by GitHub
commit ad22e61c10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
nano/node/rpc.cpp
View file

@ -2118,7 +2118,7 @@ void nano::rpc_handler::ledger ()
response_errors (); response_errors ();
} }
void nano::rpc_handler::mrai_from_raw (nano::uint128_t ratio) void nano::rpc_handler::mnano_from_raw (nano::uint128_t ratio)
{ {
auto amount (amount_impl ()); auto amount (amount_impl ());
if (!ec) if (!ec)
@ -2129,7 +2129,7 @@ void nano::rpc_handler::mrai_from_raw (nano::uint128_t ratio)
response_errors (); response_errors ();
} }
void nano::rpc_handler::mrai_to_raw (nano::uint128_t ratio) void nano::rpc_handler::mnano_to_raw (nano::uint128_t ratio)
{ {
auto amount (amount_impl ()); auto amount (amount_impl ());
if (!ec) if (!ec)
@ -4459,25 +4459,25 @@ void nano::rpc_handler::process_request ()
{ {
key_expand (); key_expand ();
} }
else if (action == "krai_from_raw") else if (action == "knano_from_raw" || action == "krai_from_raw")
{ {
mrai_from_raw (nano::kxrb_ratio); mnano_from_raw (nano::kxrb_ratio);
} }
else if (action == "krai_to_raw") else if (action == "knano_to_raw" || action == "krai_to_raw")
{ {
mrai_to_raw (nano::kxrb_ratio); mnano_to_raw (nano::kxrb_ratio);
} }
else if (action == "ledger") else if (action == "ledger")
{ {
ledger (); ledger ();
} }
else if (action == "mrai_from_raw") else if (action == "mnano_from_raw" || action == "mrai_from_raw")
{ {
mrai_from_raw (); mnano_from_raw ();
} }
else if (action == "mrai_to_raw") else if (action == "mnano_to_raw" || action == "mrai_to_raw")
{ {
mrai_to_raw (); mnano_to_raw ();
} }
else if (action == "node_id") else if (action == "node_id")
{ {
@ -4531,13 +4531,13 @@ void nano::rpc_handler::process_request ()
{ {
process (); process ();
} }
else if (action == "nano_from_raw") else if (action == "nano_from_raw" || action == "rai_from_raw")
{ {
mrai_from_raw (nano::xrb_ratio); mnano_from_raw (nano::xrb_ratio);
} }
else if (action == "nano_to_raw") else if (action == "nano_to_raw" || action == "rai_to_raw")
{ {
mrai_to_raw (nano::xrb_ratio); mnano_to_raw (nano::xrb_ratio);
} }
else if (action == "receive") else if (action == "receive")
{ {

4
nano/node/rpc.hpp
View file

@ -174,8 +174,8 @@ public:
void key_create (); void key_create ();
void key_expand (); void key_expand ();
void ledger (); void ledger ();
void mrai_to_raw (nano::uint128_t = nano::Mxrb_ratio); void mnano_to_raw (nano::uint128_t = nano::Mxrb_ratio);
void mrai_from_raw (nano::uint128_t = nano::Mxrb_ratio); void mnano_from_raw (nano::uint128_t = nano::Mxrb_ratio);
void node_id (); void node_id ();
void node_id_delete (); void node_id_delete ();
void password_change (); void password_change ();