Merge #124: Fix spelling: rename new_modeled to new_modelled

50dd350 refactor(spelling): rename 'Method::new_modeled' to 'Method::new_modelled' and everywhere it's being used (GideonBature)

Pull request description:

  This PR corrects the spelling of `Method::new_modeled` to use `Method::new_modelled` and also made corrections across all the places `new_modeled` is used to `new_modelled`.

  ### Changes Made

  - Renamed `Method::new_modeled` to `Method::new_modelled`
  - Updated all corresponding references to the renamed method

  Closes #120

ACKs for top commit:
  tcharding:
    ACK 50dd350

Tree-SHA512: 822f19d049b15e673ecee7909173a4707f4c46d9040613c653b14297553310b28a2ab42ce860dd0d141a14915723f440d2995828bd933f93b89b209a133a079d

Author: tcharding

verify/src/method/mod.rs

@@ -81,7 +81,7 @@ impl Method {
     }
 
     /// Represents a `Method` that requires a custom type as well as a type in `model`.
-    const fn new_modeled(name: &'static str, ty: &'static str, function: &'static str) -> Method {
+    const fn new_modelled(name: &'static str, ty: &'static str, function: &'static str) -> Method {
         Method { name, ret: Some(Return::Type(ty)), requires_model: true, function }
     }
 

verify/src/method/v17.rs

@@ -6,42 +6,42 @@ use super::Method;
 
 /// Data for the JSON RPC methods provided by Bitcoin Core v17.
 pub const METHODS: &[Method] = &[
-    Method::new_modeled("getbestblockhash", "GetBestBlockHash", "get_best_block_hash"),
-    Method::new_modeled("getblock", "GetBlockVerbosityZero", "get_block"), // We only check one of the types.
-    Method::new_modeled("getblockchaininfo", "GetBlockchainInfo", "get_blockchain_info"),
-    Method::new_modeled("getblockcount", "GetBlockCount", "get_block_count"),
-    Method::new_modeled("getblockhash", "GetBlockHash", "get_block_hash"),
-    Method::new_modeled("getblockheader", "GetBlockHeader", "get_block_header"),
-    Method::new_modeled("getblockstats", "GetBlockStats", "get_block_stats"),
-    Method::new_modeled("getchaintips", "GetChainTips", "get_chain_tips"),
-    Method::new_modeled("getchaintxstats", "GetChainTxStats", "get_chain_tx_stats"),
-    Method::new_modeled("getdifficulty", "GetDifficulty", "get_difficulty"),
-    Method::new_modeled("getmempoolancestors", "GetMempoolAncestors", "get_mempool_ancestors"),
-    Method::new_modeled(
+    Method::new_modelled("getbestblockhash", "GetBestBlockHash", "get_best_block_hash"),
+    Method::new_modelled("getblock", "GetBlockVerbosityZero", "get_block"), // We only check one of the types.
+    Method::new_modelled("getblockchaininfo", "GetBlockchainInfo", "get_blockchain_info"),
+    Method::new_modelled("getblockcount", "GetBlockCount", "get_block_count"),
+    Method::new_modelled("getblockhash", "GetBlockHash", "get_block_hash"),
+    Method::new_modelled("getblockheader", "GetBlockHeader", "get_block_header"),
+    Method::new_modelled("getblockstats", "GetBlockStats", "get_block_stats"),
+    Method::new_modelled("getchaintips", "GetChainTips", "get_chain_tips"),
+    Method::new_modelled("getchaintxstats", "GetChainTxStats", "get_chain_tx_stats"),
+    Method::new_modelled("getdifficulty", "GetDifficulty", "get_difficulty"),
+    Method::new_modelled("getmempoolancestors", "GetMempoolAncestors", "get_mempool_ancestors"),
+    Method::new_modelled(
         "getmempooldescendants",
         "GetMempoolDescendants",
         "get_mempool_descendants",
     ),
-    Method::new_modeled("getmempoolentry", "GetMempoolEntry", "get_mempool_entry"),
-    Method::new_modeled("getmempoolinfo", "GetMempoolInfo", "get_mempool_info"),
-    Method::new_modeled("getrawmempool", "GetRawMempool", "get_raw_mempool"),
-    Method::new_modeled("gettxout", "GetTxOut", "get_tx_out"),
+    Method::new_modelled("getmempoolentry", "GetMempoolEntry", "get_mempool_entry"),
+    Method::new_modelled("getmempoolinfo", "GetMempoolInfo", "get_mempool_info"),
+    Method::new_modelled("getrawmempool", "GetRawMempool", "get_raw_mempool"),
+    Method::new_modelled("gettxout", "GetTxOut", "get_tx_out"),
     Method::new_string("gettxoutproof", "get_tx_out_proof"),
-    Method::new_modeled("gettxoutsetinfo", "GetTxOutSetInfo", "get_tx_out_set_info"),
+    Method::new_modelled("gettxoutsetinfo", "GetTxOutSetInfo", "get_tx_out_set_info"),
     Method::new_nothing("preciousblock", "precious_block"),
     Method::new_numeric("pruneblockchain", "prune_blockchain"),
     Method::new_nothing("savemempool", "save_mempool"),
-    Method::new_modeled("scantxoutset", "ScanTxOutSet", "scan_tx_out_set"),
+    Method::new_modelled("scantxoutset", "ScanTxOutSet", "scan_tx_out_set"),
     Method::new_bool("verifychain", "verify_chain"),
-    Method::new_modeled("verifytxoutproof", "VerifyTxOutProof", "verify_tx_out_proof"),
+    Method::new_modelled("verifytxoutproof", "VerifyTxOutProof", "verify_tx_out_proof"),
     Method::new_no_model("getmemoryinfo", "GetMemoryInfoStats", "get_memory_info"),
     Method::new_string("help", "help"),
     Method::new_no_model("logging", "Logging", "logging"),
     Method::new_string("stop", "stop"),
     Method::new_numeric("uptime", "uptime"),
-    Method::new_modeled("generate", "Generate", "generate"),
-    Method::new_modeled("generatetoaddress", "GenerateToAddress", "generate_to_address"),
-    Method::new_modeled("getblocktemplate", "GetBlockTemplate", "get_block_template"),
+    Method::new_modelled("generate", "Generate", "generate"),
+    Method::new_modelled("generatetoaddress", "GenerateToAddress", "generate_to_address"),
+    Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"),
     Method::new_no_model("getmininginfo", "GetMiningInfo", "get_mining_info"),
     Method::new_nothing("getnetworkhashps", "get_network_hashes_per_second"),
     Method::new_bool("prioritisetransaction", "prioritise_transaction"),
@@ -52,7 +52,7 @@ pub const METHODS: &[Method] = &[
     Method::new_no_model("getaddednodeinfo", "GetAddedNodeInfo", "get_added_node_info"),
     Method::new_numeric("getconnectioncount", "get_connection_count"),
     Method::new_no_model("getnettotals", "GetNetTotals", "get_net_totals"),
-    Method::new_modeled("getnetworkinfo", "GetNetworkInfo", "get_network_info"),
+    Method::new_modelled("getnetworkinfo", "GetNetworkInfo", "get_network_info"),
     Method::new_no_model("getpeerinfo", "GetPeerInfo", "get_peer_info"),
     Method::new_string("listbanned", "list_banned"), // v17 docs seem wrong, says no return.
     Method::new_nothing("ping", "ping"),
@@ -69,41 +69,41 @@ pub const METHODS: &[Method] = &[
     Method::new_nothing("finalizepsbt", "finalize_psbt"),
     Method::new_nothing("fundrawtransaction", "fund_raw_transaciton"),
     Method::new_nothing("getrawtransaction", "get_raw_transaction"),
-    Method::new_modeled("sendrawtransaction", "SendRawTransaction", "send_raw_transaction"),
+    Method::new_modelled("sendrawtransaction", "SendRawTransaction", "send_raw_transaction"),
     Method::new_nothing("signrawtransaction", "sign_raw_transaction"),
     Method::new_nothing("signrawtransactionwithkey", "sign_raw_transaction_with_key"),
     Method::new_nothing("testmempoolaccept", "test_mempool_accept"),
-    Method::new_modeled("createmultisig", "CreateMultisig", "create_multisig"),
+    Method::new_modelled("createmultisig", "CreateMultisig", "create_multisig"),
     Method::new_nothing("estimatesmartfee", "estimate_smart_fee"),
     Method::new_string("signmessagewithprivkey", "sign_message_with_priv_key"),
-    Method::new_modeled("validateaddress", "ValidateAddress", "validate_address"),
+    Method::new_modelled("validateaddress", "ValidateAddress", "validate_address"),
     Method::new_bool("verifymessage", "verify_message"),
     Method::new_nothing("abandontransaction", "abandon_transaction"),
     Method::new_nothing("abortrescan", "abort_rescan"),
-    Method::new_modeled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"),
+    Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"),
     Method::new_nothing("backupwallet", "backup_wallet"),
-    Method::new_modeled("bumpfee", "BumpFee", "bump_fee"),
-    Method::new_modeled("createwallet", "CreateWallet", "create_wallet"),
-    Method::new_modeled("dumpprivkey", "DumpPrivKey", "dump_priv_key"),
-    Method::new_modeled("dumpwallet", "DumpWallet", "dump_wallet"),
+    Method::new_modelled("bumpfee", "BumpFee", "bump_fee"),
+    Method::new_modelled("createwallet", "CreateWallet", "create_wallet"),
+    Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"),
+    Method::new_modelled("dumpwallet", "DumpWallet", "dump_wallet"),
     Method::new_nothing("encryptwallet", "encrypt_wallet"),
     Method::new_nothing("getaccount", "get_account"), // Deprecated
     Method::new_nothing("getaccountaddress", "get_account_address"), // Deprecated
     Method::new_nothing("getaddressbyaccount", "get_address_by_account"), // Deprecated
-    Method::new_modeled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"),
-    Method::new_modeled("getaddressinfo", "GetAddressInfo", "get_address_info"),
-    Method::new_modeled("getbalance", "GetBalance", "get_balance"),
-    Method::new_modeled("getnewaddress", "GetNewAddress", "get_new_address"),
-    Method::new_modeled("getrawchangeaddress", "GetRawChangeAddress", "get_raw_change_address"),
+    Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"),
+    Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"),
+    Method::new_modelled("getbalance", "GetBalance", "get_balance"),
+    Method::new_modelled("getnewaddress", "GetNewAddress", "get_new_address"),
+    Method::new_modelled("getrawchangeaddress", "GetRawChangeAddress", "get_raw_change_address"),
     Method::new_nothing("getreceivedbyaccount", "get_received_by_account"), // Deprecated
-    Method::new_modeled("getreceivedbyaddress", "GetReceivedByAddress", "get_received_by_address"),
-    Method::new_modeled("gettransaction", "GetTransaction", "get_transaction"),
-    Method::new_modeled(
+    Method::new_modelled("getreceivedbyaddress", "GetReceivedByAddress", "get_received_by_address"),
+    Method::new_modelled("gettransaction", "GetTransaction", "get_transaction"),
+    Method::new_modelled(
         "getunconfirmedbalance",
         "GetUnconfirmedBalance",
         "get_unconfirmed_balance",
     ),
-    Method::new_modeled("getwalletinfo", "GetWalletInfo", "get_wallet_info"),
+    Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"),
     Method::new_nothing("importaddress", "import_addressss"),
     Method::new_nothing("importmulti", "import_multi"),
     Method::new_nothing("importprivkey", "import_priv_key"),
@@ -112,45 +112,45 @@ pub const METHODS: &[Method] = &[
     Method::new_nothing("importwallet", "import_walet"),
     Method::new_nothing("keypoolrefill", "keypool_refill"),
     Method::new_nothing("listaccounts", "list_accounts"), // Deprecated
-    Method::new_modeled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"),
-    Method::new_modeled("listlabels", "ListLabels", "list_labels"),
-    Method::new_modeled("listlockunspent", "ListLockUnspent", "list_lock_unspent"),
+    Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"),
+    Method::new_modelled("listlabels", "ListLabels", "list_labels"),
+    Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"),
     Method::new_nothing("listreceivedbyaccount", "list_received_by_account"), // Deprecated
-    Method::new_modeled(
+    Method::new_modelled(
         "listreceivedbyaddress",
         "ListReceivedByAddress",
         "list_received_by_address",
     ),
-    Method::new_modeled("listsinceblock", "ListSinceBlock", "list_since_block"),
-    Method::new_modeled("listtransactions", "ListTransactions", "list_transactions"),
-    Method::new_modeled("listunspent", "ListUnspent", "list_unspent"),
-    Method::new_modeled("listwallets", "ListWallets", "list_wallets"),
-    Method::new_modeled("loadwallet", "LoadWallet", "load_wallet"),
+    Method::new_modelled("listsinceblock", "ListSinceBlock", "list_since_block"),
+    Method::new_modelled("listtransactions", "ListTransactions", "list_transactions"),
+    Method::new_modelled("listunspent", "ListUnspent", "list_unspent"),
+    Method::new_modelled("listwallets", "ListWallets", "list_wallets"),
+    Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"),
     Method::new_bool("lockunspent", "lock_unspent"),
     Method::new_bool("move", "move"),
     Method::new_nothing("removeprunedfunds", "remove_pruned_funds"),
-    Method::new_modeled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"),
+    Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"),
     Method::new_nothing("sendfrom", "send_from"), // Deprecated
-    Method::new_modeled("sendmany", "SendMany", "send_many"),
-    Method::new_modeled("sendtoaddress", "SendToAddress", "send_to_address"),
+    Method::new_modelled("sendmany", "SendMany", "send_many"),
+    Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"),
     Method::new_nothing("setaccount", "set_account"), // Deprecated
     Method::new_nothing("sethdseed", "set_hd_seed"),
     Method::new_bool("settxfee", "set_tx_fee"),
-    Method::new_modeled("signmessage", "SignMessage", "sign_message"),
-    Method::new_modeled(
+    Method::new_modelled("signmessage", "SignMessage", "sign_message"),
+    Method::new_modelled(
         "signrawtransactionwithwallet",
         "SignRawTransactionWithWallet",
         "sign_raw_transaction_with_wallet",
     ),
     Method::new_nothing("unloadwallet", "unload_wallet"),
-    Method::new_modeled(
+    Method::new_modelled(
         "walletcreatefundedpsbt",
         "WalletCreateFundedPsbt",
         "wallet_create_funded_psbt",
     ),
     Method::new_nothing("walletlock", "wallet_lock"),
     Method::new_nothing("walletpassphrase", "wallet_passphrase"),
     Method::new_nothing("walletpassphrasechange", "wallet_passphrase_change"),
-    Method::new_modeled("walletprocesspsbt", "WalletProcessPsbt", "wallet_process_psbt"),
+    Method::new_modelled("walletprocesspsbt", "WalletProcessPsbt", "wallet_process_psbt"),
     Method::new_no_model("getzmqnotifications", "GetZmqNotifications", "get_zmq_notifications"),
 ];