Rename electrum method ...listunspent to ...list_unspent.

Author: evoskuil

include/bitcoin/server/interfaces/bitcoind_rpc.hpp

@@ -126,7 +126,7 @@ struct bitcoind_rpc_methods
         ////method<"listreceivedbyaddress", optional<1>, optional<false>, optional<false>, optional<""_t>>{ "minconf", "include_empty", "include_watchonly", "address_filter" },
         ////method<"listreceivedbylabel", optional<1>, optional<false>, optional<false>>{ "minconf", "include_empty", "include_watchonly" },
         ////method<"listtransactions", optional<""_t>, optional<10>, optional<0>, optional<false>>{ "label", "count", "skip", "include_watchonly" },
-        ////method<"listunspent", optional<1>, optional<empty::array>, optional<true>, optional<false>>{ "minconf", "addresses", "include_unsafe", "query_options" },
+        ////method<"list_unspent", optional<1>, optional<empty::array>, optional<true>, optional<false>>{ "minconf", "addresses", "include_unsafe", "query_options" },
         ////method<"loadwallet", string_t, optional<false>>{ "filename", "load_on_startup" },
         ////method<"lockunspent", boolean_t, optional<empty::array>>{ "unlock", "transactions" },
         ////method<"removeprunedfunds", string_t>{ "txid" },

include/bitcoin/server/interfaces/electrum.hpp

@@ -40,7 +40,7 @@ struct electrum_methods
         method<"blockchain.scripthash.get_balance", string_t>{ "scripthash" },
         method<"blockchain.scripthash.get_history", string_t>{ "scripthash" },
         method<"blockchain.scripthash.get_mempool", string_t>{ "scripthash" },
-        method<"blockchain.scripthash.listunspent", string_t>{ "scripthash" },
+        method<"blockchain.scripthash.list_unspent", string_t>{ "scripthash" },
         method<"blockchain.scripthash.subscribe", string_t>{ "scripthash" },
         method<"blockchain.scripthash.unsubscribe", string_t>{ "scripthash" },
         method<"blockchain.transaction.broadcast", string_t>{ "raw_tx" },
@@ -76,7 +76,7 @@ struct electrum_methods
     using blockchain_scripthash_get_balance = at<5>;
     using blockchain_scripthash_get_history = at<6>;
     using blockchain_scripthash_get_mempool = at<7>;
-    using blockchain_scripthash_listunspent = at<8>;
+    using blockchain_scripthash_list_unspent = at<8>;
     using blockchain_scripthash_subscribe = at<9>;
     using blockchain_scripthash_unsubscribe = at<10>;
     using blockchain_transaction_broadcast = at<11>;

include/bitcoin/server/protocols/protocol_electrum.hpp

@@ -73,8 +73,8 @@ class BCS_API protocol_electrum
     void handle_blockchain_scripthash_get_mempool(const code& ec,
         rpc_interface::blockchain_scripthash_get_mempool,
         const std::string& scripthash) NOEXCEPT;
-    void handle_blockchain_scripthash_listunspent(const code& ec,
-        rpc_interface::blockchain_scripthash_listunspent,
+    void handle_blockchain_scripthash_list_unspent(const code& ec,
+        rpc_interface::blockchain_scripthash_list_unspent,
         const std::string& scripthash) NOEXCEPT;
     void handle_blockchain_scripthash_subscribe(const code& ec,
         rpc_interface::blockchain_scripthash_subscribe,

src/protocols/protocol_electrum.cpp

@@ -56,7 +56,7 @@ void protocol_electrum::start() NOEXCEPT
     SUBSCRIBE_RPC(handle_blockchain_scripthash_get_balance, _1, _2, _3);
     SUBSCRIBE_RPC(handle_blockchain_scripthash_get_history, _1, _2, _3);
     SUBSCRIBE_RPC(handle_blockchain_scripthash_get_mempool, _1, _2, _3);
-    SUBSCRIBE_RPC(handle_blockchain_scripthash_listunspent, _1, _2, _3);
+    SUBSCRIBE_RPC(handle_blockchain_scripthash_list_unspent, _1, _2, _3);
     SUBSCRIBE_RPC(handle_blockchain_scripthash_subscribe, _1, _2, _3);
     SUBSCRIBE_RPC(handle_blockchain_scripthash_unsubscribe, _1, _2, _3);
     SUBSCRIBE_RPC(handle_blockchain_transaction_broadcast, _1, _2, _3);
@@ -180,8 +180,8 @@ void protocol_electrum::handle_blockchain_scripthash_get_mempool(const code& ec,
     send_code(error::not_implemented);
 }
 
-void protocol_electrum::handle_blockchain_scripthash_listunspent(const code& ec,
-    rpc_interface::blockchain_scripthash_listunspent,
+void protocol_electrum::handle_blockchain_scripthash_list_unspent(const code& ec,
+    rpc_interface::blockchain_scripthash_list_unspent,
     const std::string& ) NOEXCEPT
 {
     if (stopped(ec)) return;