Skip to content

Commit

Permalink
Request changes and bump fc steemit#591
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Vandeberg committed Nov 22, 2016
1 parent 7a4e46d commit 1834b54
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion libraries/fc
6 changes: 3 additions & 3 deletions libraries/wallet/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,9 @@ class wallet_api_impl
try
{
auto v = _remote_api->get_version();
result["server-blockchain-version"] = v.blockchain_version;
result["server-steem-revision"] = v.steem_revision;
result["server-fc-revision"] = v.fc_revision;
result["server_blockchain_version"] = v.blockchain_version;
result["server_steem_revision"] = v.steem_revision;
result["server_fc_revision"] = v.fc_revision;
}
catch( fc::exception& )
{
Expand Down
8 changes: 5 additions & 3 deletions programs/steemd/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,15 @@ int main(int argc, char** argv) {
std::cerr << "initminer public key: " << STEEMIT_INIT_PUBLIC_KEY_STR << "\n";
std::cerr << "initminer private key: " << initminer_private_key << "\n";
std::cerr << "chain id: " << std::string(STEEMIT_CHAIN_ID) << "\n";
std::cerr << "blockchain version: " << fc::string( STEEMIT_BLOCKCHAIN_VERSION ) << "\n";
std::cerr << "------------------------------------------------------\n";
#else
std::cerr << "------------------------------------------------------\n\n";
std::cerr << " STARTING STEEM NETWORK\n\n";
std::cerr << "------------------------------------------------------\n";
std::cerr << "initminer public key: " << STEEMIT_INIT_PUBLIC_KEY_STR << "\n";
std::cerr << "chain id: " << std::string(STEEMIT_CHAIN_ID) << "\n";
std::cerr << "blockchain version: " << fc::string( STEEMIT_BLOCKCHAIN_VERSION ) << "\n";
std::cerr << "------------------------------------------------------\n";
#endif

Expand Down Expand Up @@ -93,9 +95,9 @@ int main(int argc, char** argv) {

if( options.count("version") )
{
std::cout << "Steem Blockchain Version: " << fc::string( STEEMIT_BLOCKCHAIN_VERSION ) << "\n";
std::cout << "Steem git Revision: " << fc::string( graphene::utilities::git_revision_sha ) << "\n";
std::cout << "fc git Revision: " << fc::string( fc::git_revision_sha ) << "\n";
std::cout << "steem_blockchain_version: " << fc::string( STEEMIT_BLOCKCHAIN_VERSION ) << "\n";
std::cout << "steem_git_revision: " << fc::string( graphene::utilities::git_revision_sha ) << "\n";
std::cout << "fc_git_revision: " << fc::string( fc::git_revision_sha ) << "\n";
return 0;
}

Expand Down

0 comments on commit 1834b54

Please sign in to comment.