pull/600/head
Andrey Dolgolev 2022-05-05 13:12:33 +03:00
rodzic e7f3a8717b
commit 5df12db95c
1 zmienionych plików z 19 dodań i 21 usunięć

Wyświetl plik

@ -646,9 +646,9 @@ def stats_generate_handler(args: argparse.Namespace):
address_dashboard_id_subscription_id_tree: Dict[str, Any] = {} address_dashboard_id_subscription_id_tree: Dict[str, Any] = {}
for dashboard_id in dashboard_resources.resources: for dashboard in dashboard_resources.resources:
for dashboard_subscription_filters in dashboard_id.resource_data[ for dashboard_subscription_filters in dashboard.resource_data[
"subscription_settings" "subscription_settings"
]: ]:
try: try:
@ -673,21 +673,21 @@ def stats_generate_handler(args: argparse.Namespace):
address_dashboard_id_subscription_id_tree[address] = {} address_dashboard_id_subscription_id_tree[address] = {}
if ( if (
str(dashboard_id.id) str(dashboard.id)
not in address_dashboard_id_subscription_id_tree not in address_dashboard_id_subscription_id_tree
): ):
address_dashboard_id_subscription_id_tree[address][ address_dashboard_id_subscription_id_tree[address][
str(dashboard_id.id) str(dashboard.id)
] = [] ] = []
if ( if (
subscription_id subscription_id
not in address_dashboard_id_subscription_id_tree[address][ not in address_dashboard_id_subscription_id_tree[address][
str(dashboard_id.id) str(dashboard.id)
] ]
): ):
address_dashboard_id_subscription_id_tree[address][ address_dashboard_id_subscription_id_tree[address][
str(dashboard_id.id) str(dashboard.id)
].append(subscription_id) ].append(subscription_id)
if not subscription_by_id[subscription_id].resource_data["abi"]: if not subscription_by_id[subscription_id].resource_data["abi"]:
@ -729,16 +729,14 @@ def stats_generate_handler(args: argparse.Namespace):
# merged_external_calls[address] = {} # merged_external_calls[address] = {}
# merged_external_calls[address]["merged"] = set() # merged_external_calls[address]["merged"] = set()
if str(dashboard_id.id) not in merged_events[address]: if str(dashboard.id) not in merged_events[address]:
merged_events[address][str(dashboard_id.id)] = {} merged_events[address][str(dashboard.id)] = {}
if str(dashboard_id.id) not in merged_functions[address]: if str(dashboard.id) not in merged_functions[address]:
merged_functions[address][str(dashboard_id.id)] = {} merged_functions[address][str(dashboard.id)] = {}
merged_events[address][str(dashboard_id.id)][ merged_events[address][str(dashboard.id)][subscription_id] = events
subscription_id merged_functions[address][str(dashboard.id)][
] = events
merged_functions[address][str(dashboard_id.id)][
subscription_id subscription_id
] = methods ] = methods
@ -771,24 +769,24 @@ def stats_generate_handler(args: argparse.Namespace):
) )
).hexdigest() ).hexdigest()
if str(dashboard_id.id) not in merged_external_calls: if str(dashboard.id) not in merged_external_calls:
merged_external_calls[str(dashboard_id.id)] = {} merged_external_calls[str(dashboard.id)] = {}
if ( if (
subscription_id subscription_id
not in merged_external_calls[str(dashboard_id.id)] not in merged_external_calls[str(dashboard.id)]
): ):
merged_external_calls[str(dashboard_id.id)][ merged_external_calls[str(dashboard.id)][
subscription_id subscription_id
] = {} ] = {}
if ( if (
external_call_hash external_call_hash
not in merged_external_calls[str(dashboard_id.id)][ not in merged_external_calls[str(dashboard.id)][
subscription_id subscription_id
] ]
): ):
merged_external_calls[str(dashboard_id.id)][ merged_external_calls[str(dashboard.id)][
subscription_id subscription_id
] = {external_call_hash: external_call["display_name"]} ] = {external_call_hash: external_call["display_name"]}
if ( if (
@ -965,7 +963,7 @@ def stats_generate_handler(args: argparse.Namespace):
"statistics", "statistics",
f"blockchain:{args.blockchain}" f"blockchain:{args.blockchain}"
f"subscriptions:{subscription_id}", f"subscriptions:{subscription_id}",
f"dashboard:{dashboard_id}", f"dashboard:{dashboard}",
], ],
) )
logger.error(err) logger.error(err)