mirror of
https://github.com/planetmint/planetmint.git
synced 2025-11-25 06:55:45 +00:00
fixed object handling issue and complicated stuff
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
parent
1ca78c93d1
commit
b5fa127e2a
@ -328,7 +328,7 @@ class Planetmint(object):
|
|||||||
|
|
||||||
if block:
|
if block:
|
||||||
transactions = backend.query.get_transactions(self.connection, block["transactions"])
|
transactions = backend.query.get_transactions(self.connection, block["transactions"])
|
||||||
result["transactions"] = [t.to_dict() for t in self.tx_from_db(transactions)]
|
result["transactions"] = [ Transaction.from_dict(t.to_dict()).to_dict() for t in transactions]
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
@ -563,40 +563,6 @@ class Planetmint(object):
|
|||||||
def delete_elections(self, height):
|
def delete_elections(self, height):
|
||||||
return backend.query.delete_elections(self.connection, height)
|
return backend.query.delete_elections(self.connection, height)
|
||||||
|
|
||||||
def tx_from_db(self, tx_dict_list):
|
|
||||||
"""Helper method that reconstructs a transaction dict that was returned
|
|
||||||
from the database. It checks what asset_id to retrieve, retrieves the
|
|
||||||
asset from the asset table and reconstructs the transaction.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
tx_dict_list (:list:`dict` or :obj:`dict`): The transaction dict or
|
|
||||||
list of transaction dict as returned from the database.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
:class:`~Transaction`
|
|
||||||
|
|
||||||
"""
|
|
||||||
return_list = True
|
|
||||||
if isinstance(tx_dict_list, dict):
|
|
||||||
tx_dict_list = [tx_dict_list]
|
|
||||||
return_list = False
|
|
||||||
|
|
||||||
tx_map = {}
|
|
||||||
tx_ids = []
|
|
||||||
for tx in tx_dict_list:
|
|
||||||
tx.update({"metadata": None})
|
|
||||||
tx_map[tx["id"]] = tx
|
|
||||||
tx_ids.append(tx["id"])
|
|
||||||
|
|
||||||
if return_list:
|
|
||||||
tx_list = []
|
|
||||||
for tx_id, tx in tx_map.items():
|
|
||||||
tx_list.append(Transaction.from_dict(tx))
|
|
||||||
return tx_list
|
|
||||||
else:
|
|
||||||
tx = list(tx_map.values())[0]
|
|
||||||
return Transaction.from_dict(tx)
|
|
||||||
|
|
||||||
# NOTE: moved here from Election needs to be placed somewhere else
|
# NOTE: moved here from Election needs to be placed somewhere else
|
||||||
def get_validators_dict(self, height=None):
|
def get_validators_dict(self, height=None):
|
||||||
"""Return a dictionary of validators with key as `public_key` and
|
"""Return a dictionary of validators with key as `public_key` and
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user