Skip to content

Commit

Permalink
cleaned up some copy references to 'bitcoin' so that they now say 'na…
Browse files Browse the repository at this point in the history 
…mecoin'
  • Loading branch information
pvwoods committed Jun 16, 2011
1 parent 4d8971a commit bc32246
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
20 changes: 10 additions & 10 deletions init.cpp
View file
Expand Up @@ -44,7 +44,7 @@ void Shutdown(void* parg)
boost::filesystem::remove(GetPidFile());
CreateThread(ExitTimeout, NULL);
Sleep(50);
printf("Bitcoin exiting\n\n");
printf("namecoin exiting\n\n");
fExit = true;
exit(0);
}
Expand Down Expand Up @@ -144,12 +144,12 @@ bool AppInit2(int argc, char* argv[])
{
string beta = VERSION_IS_BETA ? _(" beta") : "";
string strUsage = string() +
_("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
_("namecoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
" bitcoin [options] \t " + "\n" +
" bitcoin [options] <command> [params]\t " + _("Send command to -server or bitcoind\n") +
" bitcoin [options] help \t\t " + _("List commands\n") +
" bitcoin [options] help <command> \t\t " + _("Get help for a command\n") +
" namecoin [options] \t " + "\n" +
" namecoin [options] <command> [params]\t " + _("Send command to -server or namecoind\n") +
" namecoin [options] help \t\t " + _("List commands\n") +
" namecoin [options] help <command> \t\t " + _("Get help for a command\n") +
_("Options:\n") +
" -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") +
" -pid=<file> \t\t " + _("Specify pid file (default: bitcoind.pid)\n") +
Expand Down Expand Up @@ -186,7 +186,7 @@ bool AppInit2(int argc, char* argv[])

#ifdef USE_SSL
strUsage += string() +
_("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") +
_("\nSSL options: (see the namecoin Wiki for SSL setup instructions)\n") +
" -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") +
" -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)\n") +
" -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)\n") +
Expand Down Expand Up @@ -267,7 +267,7 @@ bool AppInit2(int argc, char* argv[])
if (!fDebug && !pszSetDataDir[0])
ShrinkDebugFile();
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
printf("Bitcoin version %s\n", FormatFullVersion().c_str());
printf("namecoin version %s\n", FormatFullVersion().c_str());
#ifdef GUI
printf("OS version %s\n", ((string)wxGetOsDescription()).c_str());
printf("System default language is %d %s\n", g_locale.GetSystemLanguage(), ((string)g_locale.GetSysName()).c_str());
Expand Down Expand Up @@ -330,7 +330,7 @@ bool AppInit2(int argc, char* argv[])
static boost::interprocess::file_lock lock(strLockFile.c_str());
if (!lock.try_lock())
{
wxMessageBox(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), GetDataDir().c_str()), "Bitcoin");
wxMessageBox(strprintf(_("Cannot obtain a lock on data directory %s. namecoin is probably already running."), GetDataDir().c_str()), "Bitcoin");
return false;
}

Expand All @@ -352,7 +352,7 @@ bool AppInit2(int argc, char* argv[])
// Load data files
//
if (fDaemon)
fprintf(stdout, "bitcoin server starting\n");
fprintf(stdout, "namecoin server starting\n");
strErrors = "";
int64 nStart;

Expand Down
40 changes: 20 additions & 20 deletions rpc.cpp
View file
Expand Up @@ -152,11 +152,11 @@ Value stop(const Array& params, bool fHelp)
if (fHelp || params.size() != 0)
throw runtime_error(
"stop\n"
"Stop bitcoin server.");
"Stop namecoin server.");

// Shutdown will take long enough that the response should get back
CreateThread(Shutdown, NULL);
return "bitcoin server stopping";
return "namecoin server stopping";
}


Expand Down Expand Up @@ -298,7 +298,7 @@ Value getnewaddress(const Array& params, bool fHelp)
if (fHelp || params.size() > 1)
throw runtime_error(
"getnewaddress [account]\n"
"Returns a new bitcoin address for receiving payments. "
"Returns a new namecoin address for receiving payments. "
"If [account] is specified (recommended), it is added to the address book "
"so payments received with the address will be credited to [account].");

Expand Down Expand Up @@ -362,7 +362,7 @@ Value getaccountaddress(const Array& params, bool fHelp)
if (fHelp || params.size() != 1)
throw runtime_error(
"getaccountaddress <account>\n"
"Returns the current bitcoin address for receiving payments to this account.");
"Returns the current namecoin address for receiving payments to this account.");

// Parse the account first so we don't generate a key if there's an error
string strAccount = AccountFromValue(params[0]);
Expand All @@ -384,14 +384,14 @@ Value setaccount(const Array& params, bool fHelp)
{
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
"setaccount <bitcoinaddress> <account>\n"
"setaccount <namecoinaddress> <account>\n"
"Sets the account associated with the given address.");

string strAddress = params[0].get_str();
uint160 hash160;
bool isValid = AddressToHash160(strAddress, hash160);
if (!isValid)
throw JSONRPCError(-5, "Invalid bitcoin address");
throw JSONRPCError(-5, "Invalid namecoin address");


string strAccount;
Expand Down Expand Up @@ -420,7 +420,7 @@ Value getaccount(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 1)
throw runtime_error(
"getaccount <bitcoinaddress>\n"
"getaccount <namecoinaddress>\n"
"Returns the account associated with the given address.");

string strAddress = params[0].get_str();
Expand Down Expand Up @@ -469,7 +469,7 @@ Value sendtoaddress(const Array& params, bool fHelp)
{
if (fHelp || params.size() < 2 || params.size() > 4)
throw runtime_error(
"sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
"sendtoaddress <namecoinaddress> <amount> [comment] [comment-to]\n"
"<amount> is a real and is rounded to the nearest 0.01");

string strAddress = params[0].get_str();
Expand Down Expand Up @@ -499,14 +499,14 @@ Value getreceivedbyaddress(const Array& params, bool fHelp)
{
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
"getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
"Returns the total amount received by <bitcoinaddress> in transactions with at least [minconf] confirmations.");
"getreceivedbyaddress <namecoinaddress> [minconf=1]\n"
"Returns the total amount received by <namecoinaddress> in transactions with at least [minconf] confirmations.");

// Bitcoin address
string strAddress = params[0].get_str();
CScript scriptPubKey;
if (!scriptPubKey.SetBitcoinAddress(strAddress))
throw JSONRPCError(-5, "Invalid bitcoin address");
throw JSONRPCError(-5, "Invalid namecoin address");
if (!IsMine(scriptPubKey))
return (double)0.0;

Expand Down Expand Up @@ -747,7 +747,7 @@ Value sendfrom(const Array& params, bool fHelp)
{
if (fHelp || params.size() < 3 || params.size() > 6)
throw runtime_error(
"sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
"sendfrom <fromaccount> <tonamecoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
"<amount> is a real and is rounded to the nearest 0.01");

string strAccount = AccountFromValue(params[0]);
Expand Down Expand Up @@ -814,7 +814,7 @@ Value sendmany(const Array& params, bool fHelp)

CScript scriptPubKey;
if (!scriptPubKey.SetBitcoinAddress(strAddress))
throw JSONRPCError(-5, string("Invalid bitcoin address:")+strAddress);
throw JSONRPCError(-5, string("Invalid namecoin address:")+strAddress);
int64 nAmount = AmountFromValue(s.value_);
totalAmount += nAmount;

Expand Down Expand Up @@ -1253,8 +1253,8 @@ Value validateaddress(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 1)
throw runtime_error(
"validateaddress <bitcoinaddress>\n"
"Return information about <bitcoinaddress>.");
"validateaddress <namecoinaddress>\n"
"Return information about <namecoinaddress>.");

string strAddress = params[0].get_str();
uint160 hash160;
Expand Down Expand Up @@ -1292,10 +1292,10 @@ Value getwork(const Array& params, bool fHelp)
"If [data] is specified, tries to solve the block and returns true if it was successful.");

if (vNodes.empty())
throw JSONRPCError(-9, "Bitcoin is not connected!");
throw JSONRPCError(-9, "namecoin is not connected!");

if (IsInitialBlockDownload())
throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
throw JSONRPCError(-10, "namecoin is downloading blocks...");

static map<uint256, pair<CBlock*, unsigned int> > mapNewBlock;
static vector<CBlock*> vNewBlock;
Expand Down Expand Up @@ -1788,7 +1788,7 @@ void ThreadRPCServer2(void* parg)

if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
{
string strWhatAmI = "To use bitcoind";
string strWhatAmI = "To use namecoind";
if (mapArgs.count("-server"))
strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
else if (mapArgs.count("-daemon"))
Expand Down Expand Up @@ -1831,7 +1831,7 @@ void ThreadRPCServer2(void* parg)
}
#else
if (fUseSSL)
throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries.");
throw runtime_error("-rpcssl=1, but namecoin compiled without full openssl libraries.");
#endif

loop
Expand Down Expand Up @@ -1979,7 +1979,7 @@ Object CallRPC(const string& strMethod, const Array& params)
throw runtime_error("couldn't connect to server");
#else
if (fUseSSL)
throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries.");
throw runtime_error("-rpcssl=1, but namecoin compiled without full openssl libraries.");

ip::tcp::iostream stream(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332"));
if (stream.fail())
Expand Down

0 comments on commit bc32246

Please sign in to comment.