Skip to content

Commit

Permalink
to_pretty_string -> to_string
Browse files Browse the repository at this point in the history
  • Loading branch information
sinev-valentine committed Nov 19, 2018
1 parent 823d746 commit 48f6c2c
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions keychain_lib/include/keychain_lib/keychain_commands.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ struct keychain_command<command_te::create>: keychain_command_base
create_keyfile(filename.c_str(), fc_light::variant(keyfile));

json_response response(keyname, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (const std::exception &exc)
{
Expand Down Expand Up @@ -578,7 +578,7 @@ struct keychain_command<command_te::remove>: keychain_command_base
bfs::remove(*it);

json_response response(true, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (const std::exception &exc)
{
Expand Down Expand Up @@ -643,7 +643,7 @@ struct keychain_command<command_te::public_key>: keychain_command_base
{
keychain->key_map.clear();
json_response response(true, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
};

Expand Down Expand Up @@ -689,20 +689,20 @@ struct keychain_command<command_te::public_key>: keychain_command_base
}
catch (const std::exception & exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
}
}
}
*/
json_response response(true, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (std::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
}
};
Expand All @@ -724,12 +724,12 @@ struct keychain_command<command_te::public_key>: keychain_command_base
auto params = params_variant.as<params_t>();
keychain->unlock_time = params.seconds;
json_response response(true, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (std::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
}
};
Expand Down

0 comments on commit 48f6c2c

Please sign in to comment.