diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2014-06-26 14:39:27 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2014-10-21 04:48:31 +0000 |
| commit | d29a2917ff73f7e82b32bd94a87df3ee211a27c2 (patch) | |
| tree | 798bcc1205ce3cf6abac276aba982fefae3f562a | |
| parent | f877aaaf16e40254bf685b4195b809138501feab (diff) | |
| download | bitcoin-d29a2917ff73f7e82b32bd94a87df3ee211a27c2.tar.xz | |
Rename RPC_TRANSACTION_* errors to RPC_VERIFY_* and use RPC_VERIFY_ERROR for submitblock
| -rw-r--r-- | src/rpcmining.cpp | 2 | ||||
| -rw-r--r-- | src/rpcprotocol.h | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index a6494163aa..28076607b4 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -589,7 +589,7 @@ Value submitblock(const Array& params, bool fHelp) if (state.IsError()) { std::string strRejectReason = state.GetRejectReason(); - throw JSONRPCError(RPC_MISC_ERROR, strRejectReason); + throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason); } if (state.IsInvalid()) return "rejected"; // TODO: report validation state diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h index a9adb58803..9117248506 100644 --- a/src/rpcprotocol.h +++ b/src/rpcprotocol.h @@ -49,9 +49,14 @@ enum RPCErrorCode RPC_INVALID_PARAMETER = -8, // Invalid, missing or duplicate parameter RPC_DATABASE_ERROR = -20, // Database error RPC_DESERIALIZATION_ERROR = -22, // Error parsing or validating structure in raw format - RPC_TRANSACTION_ERROR = -25, // General error during transaction submission - RPC_TRANSACTION_REJECTED = -26, // Transaction was rejected by network rules - RPC_TRANSACTION_ALREADY_IN_CHAIN= -27, // Transaction already in chain + RPC_VERIFY_ERROR = -25, // General error during transaction or block submission + RPC_VERIFY_REJECTED = -26, // Transaction or block was rejected by network rules + RPC_VERIFY_ALREADY_IN_CHAIN = -27, // Transaction already in chain + + // Aliases for backward compatibility + RPC_TRANSACTION_ERROR = RPC_VERIFY_ERROR, + RPC_TRANSACTION_REJECTED = RPC_VERIFY_REJECTED, + RPC_TRANSACTION_ALREADY_IN_CHAIN= RPC_VERIFY_ALREADY_IN_CHAIN, // P2P client errors RPC_CLIENT_NOT_CONNECTED = -9, // Bitcoin is not connected |