diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c index 38f7c4021d17321fae1a61050f324de733ee4893..187c5a73cddbbe6d63dbf67e2297777dbf912449 100644 --- a/modules/mempool/dap_chain_mempool.c +++ b/modules/mempool/dap_chain_mempool.c @@ -1288,7 +1288,7 @@ void dap_chain_mempool_filter(dap_chain_t *a_chain, int *a_removed){ if (!l_datum) { l_removed++; log_it(L_NOTICE, "Removed datum from mempool with \"%s\" key group %s: empty (possibly trash) value", l_objs[i].key, l_gdb_group); - dap_global_db_del_sync(l_objs[i].key, l_gdb_group); + dap_global_db_del_sync(l_gdb_group, l_objs[i].key); continue; } size_t l_datum_size = dap_chain_datum_size(l_datum); diff --git a/modules/mempool/dap_chain_mempool_rpc.c b/modules/mempool/dap_chain_mempool_rpc.c index 28b7ad35ea4680d582c40ce512eceb47a1f4a0ac..5f03b2867e8e7125c144ebfe58988c9299392c59 100644 --- a/modules/mempool/dap_chain_mempool_rpc.c +++ b/modules/mempool/dap_chain_mempool_rpc.c @@ -85,7 +85,7 @@ void dap_chain_mempool_rpc_handler_list(dap_json_rpc_params_t *a_params, if (!l_datum->header.data_size || (l_datum->header.data_size > l_objs[i].value_len)) { log_it(L_ERROR, "Trash datum in GDB %s.%s, key: %s data_size:%u, value_len:%zu", l_net->pub.name, l_chain->name, l_objs[i].key, l_datum->header.data_size, l_objs[i].value_len); - dap_global_db_del(l_objs[i].key, l_gdb_group_mempool, NULL, NULL); + dap_global_db_del(l_gdb_group_mempool, l_objs[i].key, NULL, NULL); continue; } diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c index d858ed34aabace2c4103467e9e43ba38bf799cf0..1e3dc182e5a4f05835c61e6cea8f4ca55f12ffff 100644 --- a/modules/net/dap_chain_node_cli_cmd.c +++ b/modules/net/dap_chain_node_cli_cmd.c @@ -3096,7 +3096,7 @@ int com_mempool_proc(int a_argc, char **a_argv, char **a_str_reply) ret = -6; } else { dap_string_append_printf(l_str_tmp, "Datum processed well. "); - if (dap_global_db_del_sync(l_datum_hash_hex_str, l_gdb_group_mempool)){ + if (dap_global_db_del_sync(l_gdb_group_mempool, l_datum_hash_hex_str)){ dap_string_append_printf(l_str_tmp, "Warning! Can't delete datum from mempool!"); } else dap_string_append_printf(l_str_tmp, "Removed datum from mempool."); diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c index 886a66a0225927d8fb27390317503cbd92da1877..dffba69ad8fdccfdca9b5aaf69a36d5d0bb050be 100644 --- a/modules/type/dag/dap_chain_cs_dag.c +++ b/modules/type/dag/dap_chain_cs_dag.c @@ -1613,11 +1613,11 @@ static int s_cli_dag(int argc, char ** argv, char **a_str_reply) char * l_gdb_group_mempool = dap_chain_net_get_gdb_group_mempool_new(l_chain); size_t l_datum_size = 0; dap_chain_datum_t *l_datum = (dap_chain_datum_t*) - dap_global_db_get_sync(l_datum_hash_hex_str,l_gdb_group_mempool, &l_datum_size, NULL, NULL); + dap_global_db_get_sync(l_gdb_group_mempool, l_datum_hash_hex_str, &l_datum_size, NULL, NULL); if (s_callback_add_datums(l_chain, &l_datum, 1)) { char *l_datums_datum_hash_str; dap_get_data_hash_str_static(l_datum->data, l_datum->header.data_size, l_datums_datum_hash_str); - if (!dap_global_db_del_sync(l_datum_hash_str, l_gdb_group_mempool)) { + if (!dap_global_db_del_sync(l_gdb_group_mempool, l_datum_hash_str)) { dap_cli_server_cmd_set_reply_text(a_str_reply, "Converted datum %s from mempool to event in the new forming round ", l_datum_hash_str);