From 79a549391d6d0641db54757ed8fafa37ed36c253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sa=C5=82aban?= Date: Tue, 26 Dec 2017 22:02:17 +0100 Subject: [PATCH] s/JSONRPC/JSONRPCWallet/g --- monero/backends/jsonrpc.py | 2 +- tests/wallet.py | 10 +++++----- utils/walletdump.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/monero/backends/jsonrpc.py b/monero/backends/jsonrpc.py index 5ba8ee4..d88b0fd 100644 --- a/monero/backends/jsonrpc.py +++ b/monero/backends/jsonrpc.py @@ -13,7 +13,7 @@ from ..numbers import from_atomic, to_atomic _log = logging.getLogger(__name__) -class JSONRPC(object): +class JSONRPCWallet(object): def __init__(self, protocol='http', host='127.0.0.1', port=18082, path='/json_rpc', user='', password=''): self.url = '{protocol}://{host}:{port}/json_rpc'.format( protocol=protocol, diff --git a/tests/wallet.py b/tests/wallet.py index fd52a08..6417169 100644 --- a/tests/wallet.py +++ b/tests/wallet.py @@ -7,7 +7,7 @@ except ImportError: from mock import patch, Mock from monero.wallet import Wallet -from monero.backends.jsonrpc import JSONRPC +from monero.backends.jsonrpc import JSONRPCWallet class SubaddrWalletTestCase(unittest.TestCase): get_accounts_result = {'id': 0, @@ -34,7 +34,7 @@ class SubaddrWalletTestCase(unittest.TestCase): def test_get_balance(self, mock_post): mock_post.return_value.status_code = 200 mock_post.return_value.json.return_value = self.get_accounts_result - self.wallet = Wallet(JSONRPC()) + self.wallet = Wallet(JSONRPCWallet()) mock_post.return_value.json.return_value = {'id': 0, 'jsonrpc': '2.0', 'result': {'balance': 224916129245183, @@ -72,7 +72,7 @@ class SubaddrWalletTestCase(unittest.TestCase): def test_get_address(self, mock_post): mock_post.return_value.status_code = 200 mock_post.return_value.json.return_value = self.get_accounts_result - self.wallet = Wallet(JSONRPC()) + self.wallet = Wallet(JSONRPCWallet()) mock_post.return_value.json.return_value = {'id': 0, 'jsonrpc': '2.0', 'result': {'address': '9vgV48wWAPTWik5QSUSoGYicdvvsbSNHrT9Arsx1XBTz6VrWPSgfmnUKSPZDMyX4Ms8R9TkhB4uFqK9s5LUBbV6YQN2Q9ag', @@ -120,7 +120,7 @@ class SubaddrWalletTestCase(unittest.TestCase): def test_get_payments_in(self, mock_post): mock_post.return_value.status_code = 200 mock_post.return_value.json.return_value = self.get_accounts_result - self.wallet = Wallet(JSONRPC()) + self.wallet = Wallet(JSONRPCWallet()) mock_post.return_value.status_code = 200 mock_post.return_value.json.return_value ={'id': 0, 'jsonrpc': '2.0', @@ -167,7 +167,7 @@ class SubaddrWalletTestCase(unittest.TestCase): def test_get_payments_out(self, mock_post): mock_post.return_value.status_code = 200 mock_post.return_value.json.return_value = self.get_accounts_result - self.wallet = Wallet(JSONRPC()) + self.wallet = Wallet(JSONRPCWallet()) mock_post.return_value.status_code = 200 mock_post.return_value.json.return_value = {'id': 0, 'jsonrpc': '2.0', diff --git a/utils/walletdump.py b/utils/walletdump.py index d16e6da..dbba078 100644 --- a/utils/walletdump.py +++ b/utils/walletdump.py @@ -9,7 +9,7 @@ except ImportError: from urlparse import urlparse #logging.basicConfig(level='DEBUG') -from monero.backends.jsonrpc import JSONRPC +from monero.backends.jsonrpc import JSONRPCWallet from monero import exceptions from monero import Address, Wallet, as_monero @@ -20,7 +20,7 @@ def get_wallet(): argsparser.add_argument('-u', dest='user', default='', help="Wallet RPC user") argsparser.add_argument('-p', dest='password', default='', help="Wallet RPC password") args = argsparser.parse_args() - return Wallet(JSONRPC( + return Wallet(JSONRPCWallet( host=args.host, port=args.port, user=args.user, password=args.password))