s/JSONRPC/JSONRPCWallet/g
This commit is contained in:
parent
ddd54b6063
commit
79a549391d
|
@ -13,7 +13,7 @@ from ..numbers import from_atomic, to_atomic
|
||||||
_log = logging.getLogger(__name__)
|
_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=''):
|
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(
|
self.url = '{protocol}://{host}:{port}/json_rpc'.format(
|
||||||
protocol=protocol,
|
protocol=protocol,
|
||||||
|
|
|
@ -7,7 +7,7 @@ except ImportError:
|
||||||
from mock import patch, Mock
|
from mock import patch, Mock
|
||||||
|
|
||||||
from monero.wallet import Wallet
|
from monero.wallet import Wallet
|
||||||
from monero.backends.jsonrpc import JSONRPC
|
from monero.backends.jsonrpc import JSONRPCWallet
|
||||||
|
|
||||||
class SubaddrWalletTestCase(unittest.TestCase):
|
class SubaddrWalletTestCase(unittest.TestCase):
|
||||||
get_accounts_result = {'id': 0,
|
get_accounts_result = {'id': 0,
|
||||||
|
@ -34,7 +34,7 @@ class SubaddrWalletTestCase(unittest.TestCase):
|
||||||
def test_get_balance(self, mock_post):
|
def test_get_balance(self, mock_post):
|
||||||
mock_post.return_value.status_code = 200
|
mock_post.return_value.status_code = 200
|
||||||
mock_post.return_value.json.return_value = self.get_accounts_result
|
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,
|
mock_post.return_value.json.return_value = {'id': 0,
|
||||||
'jsonrpc': '2.0',
|
'jsonrpc': '2.0',
|
||||||
'result': {'balance': 224916129245183,
|
'result': {'balance': 224916129245183,
|
||||||
|
@ -72,7 +72,7 @@ class SubaddrWalletTestCase(unittest.TestCase):
|
||||||
def test_get_address(self, mock_post):
|
def test_get_address(self, mock_post):
|
||||||
mock_post.return_value.status_code = 200
|
mock_post.return_value.status_code = 200
|
||||||
mock_post.return_value.json.return_value = self.get_accounts_result
|
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,
|
mock_post.return_value.json.return_value = {'id': 0,
|
||||||
'jsonrpc': '2.0',
|
'jsonrpc': '2.0',
|
||||||
'result': {'address': '9vgV48wWAPTWik5QSUSoGYicdvvsbSNHrT9Arsx1XBTz6VrWPSgfmnUKSPZDMyX4Ms8R9TkhB4uFqK9s5LUBbV6YQN2Q9ag',
|
'result': {'address': '9vgV48wWAPTWik5QSUSoGYicdvvsbSNHrT9Arsx1XBTz6VrWPSgfmnUKSPZDMyX4Ms8R9TkhB4uFqK9s5LUBbV6YQN2Q9ag',
|
||||||
|
@ -120,7 +120,7 @@ class SubaddrWalletTestCase(unittest.TestCase):
|
||||||
def test_get_payments_in(self, mock_post):
|
def test_get_payments_in(self, mock_post):
|
||||||
mock_post.return_value.status_code = 200
|
mock_post.return_value.status_code = 200
|
||||||
mock_post.return_value.json.return_value = self.get_accounts_result
|
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.status_code = 200
|
||||||
mock_post.return_value.json.return_value ={'id': 0,
|
mock_post.return_value.json.return_value ={'id': 0,
|
||||||
'jsonrpc': '2.0',
|
'jsonrpc': '2.0',
|
||||||
|
@ -167,7 +167,7 @@ class SubaddrWalletTestCase(unittest.TestCase):
|
||||||
def test_get_payments_out(self, mock_post):
|
def test_get_payments_out(self, mock_post):
|
||||||
mock_post.return_value.status_code = 200
|
mock_post.return_value.status_code = 200
|
||||||
mock_post.return_value.json.return_value = self.get_accounts_result
|
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.status_code = 200
|
||||||
mock_post.return_value.json.return_value = {'id': 0,
|
mock_post.return_value.json.return_value = {'id': 0,
|
||||||
'jsonrpc': '2.0',
|
'jsonrpc': '2.0',
|
||||||
|
|
|
@ -9,7 +9,7 @@ except ImportError:
|
||||||
from urlparse import urlparse
|
from urlparse import urlparse
|
||||||
#logging.basicConfig(level='DEBUG')
|
#logging.basicConfig(level='DEBUG')
|
||||||
|
|
||||||
from monero.backends.jsonrpc import JSONRPC
|
from monero.backends.jsonrpc import JSONRPCWallet
|
||||||
from monero import exceptions
|
from monero import exceptions
|
||||||
from monero import Address, Wallet, as_monero
|
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('-u', dest='user', default='', help="Wallet RPC user")
|
||||||
argsparser.add_argument('-p', dest='password', default='', help="Wallet RPC password")
|
argsparser.add_argument('-p', dest='password', default='', help="Wallet RPC password")
|
||||||
args = argsparser.parse_args()
|
args = argsparser.parse_args()
|
||||||
return Wallet(JSONRPC(
|
return Wallet(JSONRPCWallet(
|
||||||
host=args.host, port=args.port,
|
host=args.host, port=args.port,
|
||||||
user=args.user,
|
user=args.user,
|
||||||
password=args.password))
|
password=args.password))
|
||||||
|
|
Loading…
Reference in New Issue