bitcoin: src/rpcrawtransaction.cpp comparison

comparison src/rpcrawtransaction.cpp @ 3588:7eb24f8cf224 draft

Document RPC error codes Replace all "magic values" in RPCError(...) by constants.

author	Wladimir J. van der Laan <laanwj@gmail.com>
date	Thu, 04 Oct 2012 09:34:44 +0200
parents	75fad4c8df94
children	abd3935e67df

comparison

equal deleted inserted replaced

-:683f60758d5f
+:7eb24f8cf224
 fVerbose = (params[1].get_int() != 0);
 CTransaction tx;
 uint256 hashBlock = 0;
 if (!GetTransaction(hash, tx, hashBlock))
-throw JSONRPCError(-5, "No information available about transaction");
+throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
 CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
 ssTx << tx;
 string strHex = HexStr(ssTx.begin(), ssTx.end());
 Array inputs = params[2].get_array();
 BOOST_FOREACH(Value& input, inputs)
 {
 CBitcoinAddress address(input.get_str());
 if (!address.IsValid())
-throw JSONRPCError(-5, string("Invalid Bitcoin address: ")+input.get_str());
+throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+input.get_str());
 if (setAddress.count(address))
-throw JSONRPCError(-8, string("Invalid parameter, duplicated address: ")+input.get_str());
+throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+input.get_str());
 setAddress.insert(address);
 }
 }
 Array results;
 {
 const Object& o = input.get_obj();
 const Value& txid_v = find_value(o, "txid");
 if (txid_v.type() != str_type)
-throw JSONRPCError(-8, "Invalid parameter, missing txid key");
+throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing txid key");
 string txid = txid_v.get_str();
 if (!IsHex(txid))
-throw JSONRPCError(-8, "Invalid parameter, expected hex txid");
+throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected hex txid");
 const Value& vout_v = find_value(o, "vout");
 if (vout_v.type() != int_type)
-throw JSONRPCError(-8, "Invalid parameter, missing vout key");
+throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing vout key");
 int nOutput = vout_v.get_int();
 if (nOutput < 0)
-throw JSONRPCError(-8, "Invalid parameter, vout must be positive");
+throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout must be positive");
 CTxIn in(COutPoint(uint256(txid), nOutput));
 rawTx.vin.push_back(in);
 }
 set<CBitcoinAddress> setAddress;
 BOOST_FOREACH(const Pair& s, sendTo)
 {
 CBitcoinAddress address(s.name_);
 if (!address.IsValid())
-throw JSONRPCError(-5, string("Invalid Bitcoin address: ")+s.name_);
+throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+s.name_);
 if (setAddress.count(address))
-throw JSONRPCError(-8, string("Invalid parameter, duplicated address: ")+s.name_);
+throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_);
 setAddress.insert(address);
 CScript scriptPubKey;
 scriptPubKey.SetDestination(address.Get());
 int64 nAmount = AmountFromValue(s.value_);
 CTransaction tx;
 try {
 ssData >> tx;
 }
 catch (std::exception &e) {
-throw JSONRPCError(-22, "TX decode failed");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 }
 Object result;
 TxToJSON(tx, 0, result);
 CTransaction tx;
 ssData >> tx;
 txVariants.push_back(tx);
 }
 catch (std::exception &e) {
-throw JSONRPCError(-22, "TX decode failed");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 }
 }
 if (txVariants.empty())
-throw JSONRPCError(-22, "Missing transaction");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Missing transaction");
 // mergedTx will end up with all the signatures; it
 // starts as a clone of the rawtx:
 CTransaction mergedTx(txVariants[0]);
 bool fComplete = true;
 {
 Array prevTxs = params[1].get_array();
 BOOST_FOREACH(Value& p, prevTxs)
 {
 if (p.type() != obj_type)
-throw JSONRPCError(-22, "expected object with {\"txid'\",\"vout\",\"scriptPubKey\"}");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "expected object with {\"txid'\",\"vout\",\"scriptPubKey\"}");
 Object prevOut = p.get_obj();
 RPCTypeCheck(prevOut, map_list_of("txid", str_type)("vout", int_type)("scriptPubKey", str_type));
 string txidHex = find_value(prevOut, "txid").get_str();
 if (!IsHex(txidHex))
-throw JSONRPCError(-22, "txid must be hexadecimal");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "txid must be hexadecimal");
 uint256 txid;
 txid.SetHex(txidHex);
 int nOut = find_value(prevOut, "vout").get_int();
 if (nOut < 0)
-throw JSONRPCError(-22, "vout must be positive");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "vout must be positive");
 string pkHex = find_value(prevOut, "scriptPubKey").get_str();
 if (!IsHex(pkHex))
-throw JSONRPCError(-22, "scriptPubKey must be hexadecimal");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "scriptPubKey must be hexadecimal");
 vector<unsigned char> pkData(ParseHex(pkHex));
 CScript scriptPubKey(pkData.begin(), pkData.end());
 COutPoint outpoint(txid, nOut);
 if (mapPrevOut.count(outpoint))
 if (mapPrevOut[outpoint] != scriptPubKey)
 {
 string err("Previous output scriptPubKey mismatch:\n");
 err = err + mapPrevOut[outpoint].ToString() + "\nvs:\n"+
 scriptPubKey.ToString();
-throw JSONRPCError(-22, err);
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err);
 }
 }
 else
 mapPrevOut[outpoint] = scriptPubKey;
 }
 BOOST_FOREACH(Value k, keys)
 {
 CBitcoinSecret vchSecret;
 bool fGood = vchSecret.SetString(k.get_str());
 if (!fGood)
-throw JSONRPCError(-5,"Invalid private key");
+throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,"Invalid private key");
 CKey key;
 bool fCompressed;
 CSecret secret = vchSecret.GetSecret(fCompressed);
 key.SetSecret(secret, fCompressed);
 tempKeystore.AddKey(key);
 ;
 string strHashType = params[3].get_str();
 if (mapSigHashValues.count(strHashType))
 nHashType = mapSigHashValues[strHashType];
 else
-throw JSONRPCError(-8, "Invalid sighash param");
+throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid sighash param");
 }
 bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
 // Sign what we can:
 // deserialize binary data stream
 try {
 ssData >> tx;
 }
 catch (std::exception &e) {
-throw JSONRPCError(-22, "TX decode failed");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
 }
 uint256 hashTx = tx.GetHash();
 // See if the transaction is already in a block
 // or in the memory pool:
 CTransaction existingTx;
 uint256 hashBlock = 0;
 if (GetTransaction(hashTx, existingTx, hashBlock))
 {
 if (hashBlock != 0)
-throw JSONRPCError(-5, string("transaction already in block ")+hashBlock.GetHex());
+throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("transaction already in block ")+hashBlock.GetHex());
 // Not in block, but already in the memory pool; will drop
 // through to re-relay it.
 }
 else
 {
 // push to local node
 CTxDB txdb("r");
 if (!tx.AcceptToMemoryPool(txdb))
-throw JSONRPCError(-22, "TX rejected");
+throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX rejected");
 SyncWithWallets(tx, NULL, true);
 }
 RelayMessage(CInv(MSG_TX, hashTx), tx);

Mercurial > hg > bitcoin

comparison src/rpcrawtransaction.cpp @ 3588:7eb24f8cf224 draft