RPC: drop "ed" suffix from input arguments for shield export commands

Fuzzbawls · furszy · commit 3bfb513d38d3 · 2021-01-05T18:24:40.000-03:00
Also drop the "ed" suffix from return error messages in these two commands. Github-Pull: #2119 Rebased-From: c15c5c6
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -885,13 +885,13 @@ UniValue exportsaplingviewingkey(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw std::runtime_error(
-                "exportsaplingviewingkey \"shielded_addr\"\n"
-                "\nReveals the viewing key corresponding to 'shielded addr'.\n"
+                "exportsaplingviewingkey \"shield_addr\"\n"
+                "\nReveals the viewing key corresponding to 'shield_addr'.\n"
                 "Then the importsaplingviewingkey can be used with this output\n"
                 + HelpRequiringPassphrase() + "\n"
 
                 "\nArguments:\n"
-                "1. \"shielded_addr\"   (string, required) The shielded addr for the viewing key\n"
+                "1. \"shield_addr\"   (string, required) The shield addr for the viewing key\n"
 
                 "\nResult:\n"
                 "\"vkey\"                  (string) The viewing key\n"
@@ -909,28 +909,28 @@ UniValue exportsaplingviewingkey(const JSONRPCRequest& request)
     std::string strAddress = request.params[0].get_str();
     auto address = KeyIO::DecodePaymentAddress(strAddress);
     if (!IsValidPaymentAddress(address)) {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid shielded addr");
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid shield addr");
     }
     const libzcash::SaplingPaymentAddress &sapAddr = *boost::get<libzcash::SaplingPaymentAddress>(&address);
     auto vk = pwalletMain->GetSaplingScriptPubKeyMan()->GetViewingKeyForPaymentAddress(sapAddr);
     if (vk) {
         return KeyIO::EncodeViewingKey(vk.get());
     } else {
-        throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold private key or viewing key for this shielded addr");
+        throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold private key or viewing key for this shield addr");
     }
 }
 
 UniValue exportsaplingkey(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
         throw std::runtime_error(
-                "exportsaplingkey \"shielded addr\"\n"
-                "\nReveals the key corresponding to the 'shielded addr'.\n"
+                "exportsaplingkey \"shield_addr\"\n"
+                "\nReveals the key corresponding to the 'shield_addr'.\n"
                 "Then the importsaplingkey can be used with this output\n"
                 + HelpRequiringPassphrase() + "\n"
 
                 "\nArguments:\n"
-                "1. \"addr\"   (string, required) The shielded addr for the private key\n"
+                "1. \"addr\"   (string, required) The shield addr for the private key\n"
 
                 "\nResult:\n"
                 "\"key\"                  (string) The private key\n"
@@ -950,14 +950,14 @@ UniValue exportsaplingkey(const JSONRPCRequest& request)
 
     auto address = KeyIO::DecodePaymentAddress(strAddress);
     if (!IsValidPaymentAddress(address)) {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid shielded addr");
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid shield addr");
     }
     libzcash::SaplingPaymentAddress addr = *boost::get<libzcash::SaplingPaymentAddress>(&address);
 
     // Sapling support
     Optional<libzcash::SaplingExtendedSpendingKey> sk = pwalletMain->GetSaplingScriptPubKeyMan()->GetSpendingKeyForPaymentAddress(addr);
     if (!sk) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold private key for this shielded addr");
+        throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold private key for this shield addr");
     }
     return KeyIO::EncodeSpendingKey(libzcash::SpendingKey(sk.get()));
 }
