Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
JoelKatz
2013-01-16 08:55:12 -08:00
3 changed files with 3 additions and 3 deletions

2
.gitignore vendored
View File

@@ -28,7 +28,7 @@ tmp
# Ignore database directory.
db/*.db
db/*.db-journal
db/*.db-*
# Ignore obj files
Debug/*.*

View File

@@ -535,7 +535,7 @@ Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
if (i < 0)
{
return rpcError(rpcBAD_SYNTAX);
return rpcError(rpcUNKNOWN_COMMAND);
}
else if ((commandsA[i].iMinParams >= 0 && jvParams.size() < commandsA[i].iMinParams)
|| (commandsA[i].iMaxParams >= 0 && jvParams.size() > commandsA[i].iMaxParams))

View File

@@ -63,7 +63,7 @@ Json::Value rpcError(int iError, Json::Value jvResult)
{ rpcSRC_ISR_MALFORMED, "srcIsrMalformed", "Source issuer is malformed." },
{ rpcSRC_UNCLAIMED, "srcUnclaimed", "Source account is not claimed." },
{ rpcTXN_NOT_FOUND, "txnNotFound", "Transaction not found." },
{ rpcUNKNOWN_COMMAND, "unknownCmd", "Unknown command." },
{ rpcUNKNOWN_COMMAND, "unknownCmd", "Unknown method." },
{ rpcWRONG_SEED, "wrongSeed", "The regular key does not point as the master key." },
};