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

Merge pull request #3387 from nanocurrency/fix_wallet_pending

Browse source 
wallet_pending and accounts_pending handle empty results differently
This commit is contained in:
clemahieu 2021-07-22 11:38:34 +01:00 • committed by GitHub
commit 0a95131229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nano/node/json_handler.cpp
View file

@ -1002,7 +1002,10 @@ void nano::json_handler::accounts_pending ()
});
}
}
pending.add_child (account.to_account (), peers_l);
if (!peers_l.empty ())
{
pending.add_child (account.to_account (), peers_l);
}
}
}
response_l.add_child ("blocks", pending);

10
nano/rpc_test/rpc.cpp
View file

@ -142,7 +142,15 @@ boost::property_tree::ptree wait_response (nano::system & system, std::shared_pt
void check_block_response_count (nano::system & system, std::shared_ptr<nano::rpc> const & rpc, boost::property_tree::ptree & request, uint64_t size_count)
{
auto response (wait_response (system, rpc, request));
ASSERT_EQ (size_count, response.get_child ("blocks").front ().second.size ());
auto & blocks = response.get_child ("blocks");
if (size_count > 0)
{
ASSERT_EQ (size_count, blocks.front ().second.size ());
}
else
{
ASSERT_TRUE (blocks.empty ());
}
}
class scoped_io_thread_name_change