Skip to content

Commit

Permalink
Merge pull request bitcoin#9 from leto/master
Browse files Browse the repository at this point in the history
Trivial rebranding so Chips identifies itself correctly on start+stop
  • Loading branch information
jl777 committed Apr 21, 2018
2 parents 678998a + 8d74c41 commit 6b036bc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/bitcoind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ bool AppInit(int argc, char* argv[])
if (GetBoolArg("-daemon", false))
{
#if HAVE_DECL_DAEMON
fprintf(stdout, "Bitcoin server starting\n");
fprintf(stdout, "Chips server starting\n");

// Daemonize
if (daemon(1, 0)) { // don't chdir (1), do close FDs (0)
Expand Down
4 changes: 2 additions & 2 deletions src/rpc/mining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,10 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");

if (g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL) == 0)
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!");
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Chips is not connected!");

if (IsInitialBlockDownload())
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks...");
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Chips is downloading blocks...");

static unsigned int nTransactionsUpdatedLast;

Expand Down
4 changes: 2 additions & 2 deletions src/rpc/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,11 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
throw std::runtime_error(
"stop\n"
"\nStop Bitcoin server.");
"\nStop Chips server.");
// Event loop will exit after current HTTP requests have been handled, so
// this reply will get back to the client.
StartShutdown();
return "Bitcoin server stopping";
return "Chips server stopping";
}

UniValue uptime(const JSONRPCRequest& jsonRequest)
Expand Down

0 comments on commit 6b036bc

Please sign in to comment.