From 6da1aa9f39a2adea5dff65c755d696a424d72ed0 Mon Sep 17 00:00:00 2001 From: pixelsoup42 Date: Tue, 12 Sep 2023 12:16:22 +0200 Subject: [PATCH] cleanup --- .../cardano_account_pandas_dumper.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/cardano_account_pandas_dumper/cardano_account_pandas_dumper.py b/src/cardano_account_pandas_dumper/cardano_account_pandas_dumper.py index c892538..596164f 100644 --- a/src/cardano_account_pandas_dumper/cardano_account_pandas_dumper.py +++ b/src/cardano_account_pandas_dumper/cardano_account_pandas_dumper.py @@ -200,9 +200,6 @@ def _reward_transactions(self, api: BlockFrostApi) -> pd.Series: ).sort_index() -TRANSACTION_OFFSET = np.timedelta64(1000, "ns") - - class AccountPandasDumper: """Hold logic to convert an instance of AccountData to a Pandas dataframe.""" @@ -211,6 +208,7 @@ class AccountPandasDumper: MUTED_POLICIES_KEY = "muted_policies" SCRIPTS_KEY = "scripts" LABELS_KEY = "labels" + TRANSACTION_OFFSET = np.timedelta64(1000, "ns") def __init__(self, data: AccountData, known_dict: Any, args: argparse.Namespace): self.data = data @@ -364,11 +362,11 @@ def _transaction_balance(self, transaction: blockfrost.utils.Namespace) -> Any: return result - @staticmethod - def _extract_timestamp(transaction: blockfrost.utils.Namespace) -> Any: + @classmethod + def _extract_timestamp(cls, transaction: blockfrost.utils.Namespace) -> Any: return np.datetime64( datetime.datetime.fromtimestamp(transaction.block_time) - ) + (int(transaction.index) * TRANSACTION_OFFSET) + ) + (int(transaction.index) * cls.TRANSACTION_OFFSET) def _drop_foreign_assets(self, balance: pd.DataFrame) -> None: # Drop assets that only touch foreign addresses @@ -436,14 +434,12 @@ def make_transaction_frame(self) -> pd.DataFrame: self._drop_muted_policies(balance) # self._relabel_assets(balance) balance.columns = pd.MultiIndex.from_tuples(balance.columns) - balance.sort_index(axis=1, level=0, sort_remaining=True, inplace=True) - balance_column_index_length = len(balance.columns[0]) frame = pd.concat([timestamp, tx_hash, message], axis=1) frame.reset_index(drop=True, inplace=True) frame.columns = pd.MultiIndex.from_tuples( [ - ("metadata", c) + (balance_column_index_length - 2) * ("",) + ("metadata", c) + (len(balance.columns[0]) - 2) * ("",) for c in frame.columns ] )