mirror of
https://git.wownero.com/lza_menace/wownero-python.git
synced 2024-08-15 03:25:25 +00:00
Remove excessive get_ prefixes from method names
This commit is contained in:
Michał Sałaban
parent
218d3dc36f
commit
c695e43883
11 changed files with 116 additions and 116 deletions
|
|
@ -9,33 +9,33 @@ class Account(object):
|
|||
self.index = index
|
||||
self._backend = backend
|
||||
|
||||
def get_balances(self):
|
||||
return self._backend.get_balances(account=self.index)
|
||||
def balances(self):
|
||||
return self._backend.balances(account=self.index)
|
||||
|
||||
def get_balance(self, unlocked=False):
|
||||
return self._backend.get_balances(account=self.index)[1 if unlocked else 0]
|
||||
def balance(self, unlocked=False):
|
||||
return self._backend.balances(account=self.index)[1 if unlocked else 0]
|
||||
|
||||
def get_address(self):
|
||||
def address(self):
|
||||
"""
|
||||
Return account's main address.
|
||||
"""
|
||||
return self._backend.get_addresses(account=self.index)[0]
|
||||
return self._backend.addresses(account=self.index)[0]
|
||||
|
||||
def get_addresses(self):
|
||||
return self._backend.get_addresses(account=self.index)
|
||||
def addresses(self):
|
||||
return self._backend.addresses(account=self.index)
|
||||
|
||||
def new_address(self, label=None):
|
||||
return self._backend.new_address(account=self.index, label=label)
|
||||
|
||||
def get_payments(self, payment_id=None):
|
||||
return self._backend.get_payments(account=self.index, payment_id=payment_id)
|
||||
def payments(self, payment_id=None):
|
||||
return self._backend.payments(account=self.index, payment_id=payment_id)
|
||||
|
||||
def get_transactions_in(self, confirmed=True, unconfirmed=False):
|
||||
return self._backend.get_transactions_in(
|
||||
def transactions_in(self, confirmed=True, unconfirmed=False):
|
||||
return self._backend.transactions_in(
|
||||
account=self.index, confirmed=confirmed, unconfirmed=unconfirmed)
|
||||
|
||||
def get_transactions_out(self, confirmed=True, unconfirmed=True):
|
||||
return self._backend.get_transactions_out(
|
||||
def transactions_out(self, confirmed=True, unconfirmed=True):
|
||||
return self._backend.transactions_out(
|
||||
account=self.index, confirmed=confirmed, unconfirmed=unconfirmed)
|
||||
|
||||
def transfer(self, address, amount,
|
||||
|
|
|
|||
|
|
@ -48,14 +48,14 @@ class Address(object):
|
|||
"""
|
||||
return self._decoded[0] == self._valid_netbytes[1]
|
||||
|
||||
def get_view_key(self):
|
||||
def view_key(self):
|
||||
"""Returns public view key.
|
||||
|
||||
:rtype: str
|
||||
"""
|
||||
return hexlify(self._decoded[33:65]).decode()
|
||||
|
||||
def get_spend_key(self):
|
||||
def spend_key(self):
|
||||
"""Returns public spend key.
|
||||
|
||||
:rtype: str
|
||||
|
|
@ -116,14 +116,14 @@ class IntegratedAddress(Address):
|
|||
"is {addr} ({len} chars length)".format(addr=address, len=len(address)))
|
||||
self._decode(address)
|
||||
|
||||
def get_payment_id(self):
|
||||
def payment_id(self):
|
||||
"""Returns the integrated payment id.
|
||||
|
||||
:rtype: PaymentID
|
||||
"""
|
||||
return numbers.PaymentID(hexlify(self._decoded[65:-4]).decode())
|
||||
|
||||
def get_base_address(self):
|
||||
def base_address(self):
|
||||
"""Returns the base address without payment id.
|
||||
:rtype: Address
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class JSONRPCDaemon(object):
|
|||
port=port)
|
||||
_log.debug("JSONRPC daemon backend URL: {url}".format(url=self.url))
|
||||
|
||||
def get_info(self):
|
||||
def info(self):
|
||||
info = self.raw_jsonrpc_request('get_info')
|
||||
return info
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ class JSONRPCDaemon(object):
|
|||
"{status}: {reason}".format(**res),
|
||||
details=res)
|
||||
|
||||
def get_mempool(self):
|
||||
def mempool(self):
|
||||
res = self.raw_request('/get_transaction_pool', {})
|
||||
txs = []
|
||||
for tx in res.get('transactions', []):
|
||||
|
|
@ -113,20 +113,20 @@ class JSONRPCWallet(object):
|
|||
_log.debug("JSONRPC wallet backend auth: '{user}'/'{stars}'".format(
|
||||
user=user, stars=('*' * len(password)) if password else ''))
|
||||
|
||||
def get_height(self):
|
||||
def height(self):
|
||||
return self.raw_request('getheight')['height']
|
||||
|
||||
def get_spend_key(self):
|
||||
def spend_key(self):
|
||||
# NOTE: This will fail on 0.11.x, the method was missing
|
||||
return self.raw_request('query_key', {'key_type': 'spend_key'})['key']
|
||||
|
||||
def get_view_key(self):
|
||||
def view_key(self):
|
||||
return self.raw_request('query_key', {'key_type': 'view_key'})['key']
|
||||
|
||||
def get_seed(self):
|
||||
def seed(self):
|
||||
return self.raw_request('query_key', {'key_type': 'mnemonic'})['key']
|
||||
|
||||
def get_accounts(self):
|
||||
def accounts(self):
|
||||
accounts = []
|
||||
try:
|
||||
_accounts = self.raw_request('get_accounts')
|
||||
|
|
@ -147,7 +147,7 @@ class JSONRPCWallet(object):
|
|||
_account = self.raw_request('create_account', {'label': label})
|
||||
return Account(self, _account['account_index']), SubAddress(_account['address'])
|
||||
|
||||
def get_addresses(self, account=0):
|
||||
def addresses(self, account=0):
|
||||
_addresses = self.raw_request('getaddress', {'account_index': account})
|
||||
if 'addresses' not in _addresses:
|
||||
# monero <= 0.11
|
||||
|
|
@ -165,11 +165,11 @@ class JSONRPCWallet(object):
|
|||
'create_address', {'account_index': account, 'label': label})
|
||||
return SubAddress(_address['address'])
|
||||
|
||||
def get_balances(self, account=0):
|
||||
def balances(self, account=0):
|
||||
_balance = self.raw_request('getbalance', {'account_index': account})
|
||||
return (from_atomic(_balance['balance']), from_atomic(_balance['unlocked_balance']))
|
||||
|
||||
def get_payments(self, account=0, payment_id=0):
|
||||
def payments(self, account=0, payment_id=0):
|
||||
payment_id = PaymentID(payment_id)
|
||||
_log.debug("Getting payments for account {acc}, payment_id {pid}".format(
|
||||
acc=account, pid=payment_id))
|
||||
|
|
@ -183,7 +183,7 @@ class JSONRPCWallet(object):
|
|||
pmts.append(self._inpayment(data))
|
||||
return pmts
|
||||
|
||||
def get_transactions_in(self, account=0, confirmed=True, unconfirmed=False):
|
||||
def transactions_in(self, account=0, confirmed=True, unconfirmed=False):
|
||||
_txns = self.raw_request('get_transfers',
|
||||
{'account_index': account, 'in': confirmed, 'out': False, 'pool': unconfirmed})
|
||||
txns = _txns.get('in', [])
|
||||
|
|
@ -191,7 +191,7 @@ class JSONRPCWallet(object):
|
|||
txns.extend(_txns.get('pool', []))
|
||||
return [self._inpayment(tx) for tx in sorted(txns, key=operator.itemgetter('timestamp'))]
|
||||
|
||||
def get_transactions_out(self, account=0, confirmed=True, unconfirmed=True):
|
||||
def transactions_out(self, account=0, confirmed=True, unconfirmed=True):
|
||||
_txns = self.raw_request('get_transfers',
|
||||
{'account_index': account, 'in': False, 'out': confirmed, 'pool': unconfirmed})
|
||||
txns = _txns.get('out', [])
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ class Daemon(object):
|
|||
def __init__(self, backend):
|
||||
self._backend = backend
|
||||
|
||||
def get_info(self):
|
||||
return self._backend.get_info()
|
||||
def info(self):
|
||||
return self._backend.info()
|
||||
|
||||
def get_height(self):
|
||||
return self._backend.get_info()['height']
|
||||
def height(self):
|
||||
return self._backend.info()['height']
|
||||
|
||||
def send_transaction(self, tx):
|
||||
return self._backend.send_transaction(tx.blob)
|
||||
|
||||
def get_mempool(self):
|
||||
return self._backend.get_mempool()
|
||||
def mempool(self):
|
||||
return self._backend.mempool()
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class Wallet(object):
|
|||
def refresh(self):
|
||||
self.accounts = self.accounts or []
|
||||
idx = 0
|
||||
for _acc in self._backend.get_accounts():
|
||||
for _acc in self._backend.accounts():
|
||||
try:
|
||||
if self.accounts[idx]:
|
||||
continue
|
||||
|
|
@ -22,29 +22,29 @@ class Wallet(object):
|
|||
self.accounts.append(_acc)
|
||||
idx += 1
|
||||
|
||||
def get_height(self):
|
||||
def height(self):
|
||||
"""
|
||||
Returns the height of the wallet.
|
||||
"""
|
||||
return self._backend.get_height()
|
||||
return self._backend.height()
|
||||
|
||||
def get_spend_key(self):
|
||||
def spend_key(self):
|
||||
"""
|
||||
Returns private spend key.
|
||||
"""
|
||||
return self._backend.get_spend_key()
|
||||
return self._backend.spend_key()
|
||||
|
||||
def get_view_key(self):
|
||||
def view_key(self):
|
||||
"""
|
||||
Returns private view key.
|
||||
"""
|
||||
return self._backend.get_view_key()
|
||||
return self._backend.view_key()
|
||||
|
||||
def get_seed(self):
|
||||
def seed(self):
|
||||
"""
|
||||
Returns word seed.
|
||||
"""
|
||||
return self._backend.get_seed()
|
||||
return self._backend.seed()
|
||||
|
||||
def new_account(self, label=None):
|
||||
acc, addr = self._backend.new_account(label=label)
|
||||
|
|
@ -59,32 +59,32 @@ class Wallet(object):
|
|||
txn = self._backend.get_transaction(txn)
|
||||
if txn.height is None:
|
||||
return 0
|
||||
return max(0, self.get_height() - txn.height)
|
||||
return max(0, self.height() - txn.height)
|
||||
|
||||
# Following methods operate on default account (index=0)
|
||||
def get_balances(self):
|
||||
return self.accounts[0].get_balances()
|
||||
def balances(self):
|
||||
return self.accounts[0].balances()
|
||||
|
||||
def get_balance(self, unlocked=False):
|
||||
return self.accounts[0].get_balance(unlocked=unlocked)
|
||||
def balance(self, unlocked=False):
|
||||
return self.accounts[0].balance(unlocked=unlocked)
|
||||
|
||||
def get_address(self):
|
||||
return self.accounts[0].get_addresses()[0]
|
||||
def address(self):
|
||||
return self.accounts[0].addresses()[0]
|
||||
|
||||
def get_addresses(self):
|
||||
return self.accounts[0].get_addresses()
|
||||
def addresses(self):
|
||||
return self.accounts[0].addresses()
|
||||
|
||||
def new_address(self, label=None):
|
||||
return self.accounts[0].new_address(label=label)
|
||||
|
||||
def get_payments(self, payment_id=None):
|
||||
return self.accounts[0].get_payments(payment_id=payment_id)
|
||||
def payments(self, payment_id=None):
|
||||
return self.accounts[0].payments(payment_id=payment_id)
|
||||
|
||||
def get_transactions_in(self, confirmed=True, unconfirmed=False):
|
||||
return self.accounts[0].get_transactions_in(confirmed=confirmed, unconfirmed=unconfirmed)
|
||||
def transactions_in(self, confirmed=True, unconfirmed=False):
|
||||
return self.accounts[0].transactions_in(confirmed=confirmed, unconfirmed=unconfirmed)
|
||||
|
||||
def get_transactions_out(self, confirmed=True, unconfirmed=True):
|
||||
return self.accounts[0].get_transactions_out(confirmed=confirmed, unconfirmed=unconfirmed)
|
||||
def transactions_out(self, confirmed=True, unconfirmed=True):
|
||||
return self.accounts[0].transactions_out(confirmed=confirmed, unconfirmed=unconfirmed)
|
||||
|
||||
def transfer(self, address, amount,
|
||||
priority=prio.NORMAL, ringsize=5, payment_id=None, unlock_time=0,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue