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

Use defaults for amounts in toml (#2248)

Browse source
This commit is contained in:
cryptocode 2019-08-25 10:40:30 +02:00 • committed by GitHub
commit 6374ab3cef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
nano/node/nodeconfig.cpp
View file

@ -233,19 +233,31 @@ nano::error nano::node_config::deserialize_toml (nano::tomlconfig & toml)
toml.get_error ().set ("At least one representative account must be set"); toml.get_error ().set ("At least one representative account must be set");
} }
auto receive_minimum_l (toml.get<std::string> ("receive_minimum")); auto receive_minimum_l (receive_minimum.to_string_dec ());
if (toml.has_key ("receive_minimum"))
{
receive_minimum_l = toml.get<std::string> ("receive_minimum");
}
if (receive_minimum.decode_dec (receive_minimum_l)) if (receive_minimum.decode_dec (receive_minimum_l))
{ {
toml.get_error ().set ("receive_minimum contains an invalid decimal amount"); toml.get_error ().set ("receive_minimum contains an invalid decimal amount");
} }
auto online_weight_minimum_l (toml.get<std::string> ("online_weight_minimum")); auto online_weight_minimum_l (online_weight_minimum.to_string_dec ());
if (toml.has_key ("online_weight_minimum"))
{
online_weight_minimum_l = toml.get<std::string> ("online_weight_minimum");
}
if (online_weight_minimum.decode_dec (online_weight_minimum_l)) if (online_weight_minimum.decode_dec (online_weight_minimum_l))
{ {
toml.get_error ().set ("online_weight_minimum contains an invalid decimal amount"); toml.get_error ().set ("online_weight_minimum contains an invalid decimal amount");
} }
auto vote_minimum_l (toml.get<std::string> ("vote_minimum")); auto vote_minimum_l (vote_minimum.to_string_dec ());
if (toml.has_key ("vote_minimum"))
{
vote_minimum_l = toml.get<std::string> ("vote_minimum");
}
if (vote_minimum.decode_dec (vote_minimum_l)) if (vote_minimum.decode_dec (vote_minimum_l))
{ {
toml.get_error ().set ("vote_minimum contains an invalid decimal amount"); toml.get_error ().set ("vote_minimum contains an invalid decimal amount");