From 05404713cef9c7768c21f18e66352f45d5397f1d Mon Sep 17 00:00:00 2001 From: wezrule Date: Fri, 6 Nov 2020 14:51:34 +0000 Subject: [PATCH] Add confirmed_height in account_info RPC to be consistent --- nano/node/json_handler.cpp | 3 ++- nano/rpc_test/rpc.cpp | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp index bf1f55eb43..a5d83cfe37 100644 --- a/nano/node/json_handler.cpp +++ b/nano/node/json_handler.cpp @@ -638,15 +638,16 @@ void nano::json_handler::account_info () response_l.put ("modified_timestamp", std::to_string (info.modified)); response_l.put ("block_count", std::to_string (info.block_count)); response_l.put ("account_version", epoch_as_string (info.epoch ())); - response_l.put ("confirmation_height", std::to_string (confirmation_height_info.height)); auto confirmed_frontier = confirmation_height_info.frontier.to_string (); if (include_confirmed) { + response_l.put ("confirmed_height", std::to_string (confirmation_height_info.height)); response_l.put ("confirmed_frontier", confirmed_frontier); } else { // For backwards compatibility purposes + response_l.put ("confirmation_height", std::to_string (confirmation_height_info.height)); response_l.put ("confirmation_height_frontier", confirmed_frontier); } diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index a69438cc56..7909a3476c 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -4859,9 +4859,9 @@ TEST (rpc, account_info) { test_response response (request, rpc.config.port, system.io_ctx); ASSERT_TIMELY (5s, response.status != 0); - std::string balance (response.json.get ("balance")); + auto balance (response.json.get ("balance")); ASSERT_EQ ("25", balance); - std::string confirmed_balance (response.json.get ("confirmed_balance")); + auto confirmed_balance (response.json.get ("confirmed_balance")); ASSERT_EQ ("340282366920938463463374607431768211455", confirmed_balance); auto representative (response.json.get ("representative")); @@ -4869,6 +4869,12 @@ TEST (rpc, account_info) auto confirmed_representative (response.json.get ("confirmed_representative")); ASSERT_EQ (confirmed_representative, nano::dev_genesis_key.pub.to_account ()); + + auto confirmed_frontier (response.json.get ("confirmed_frontier")); + ASSERT_EQ (nano::genesis_hash.to_string (), confirmed_frontier); + + auto confirmed_height (response.json.get ("confirmed_height")); + ASSERT_EQ (1, confirmed_height); } request.put ("account", key1.pub.to_account ()); @@ -4897,6 +4903,12 @@ TEST (rpc, account_info) auto confirmed_representative (response.json.get_optional ("confirmed_representative")); ASSERT_FALSE (confirmed_representative.is_initialized ()); + + auto confirmed_frontier (response.json.get_optional ("confirmed_frontier")); + ASSERT_FALSE (confirmed_frontier.is_initialized ()); + + auto confirmed_height (response.json.get_optional ("confirmed_height")); + ASSERT_FALSE (confirmed_height.is_initialized ()); } }