diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c index 6570a5af1daedede5b5f276fb7e35b43f274b7b5..12c8828be70285131f46a292af10e0ca10f29886 100644 --- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c +++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c @@ -214,9 +214,10 @@ void dap_chain_cs_esbocs_deinit(void) } void dap_chain_esbocs_change_debug_mode(dap_chain_t *a_chain, bool a_enable){ - dap_chain_cs_blocks_t *l_bocks = DAP_CHAIN_CS_BLOCKS(a_chain); - dap_chain_esbocs_pvt_t *pvt = PVT(l_bocks); - pvt->debug = a_enable; + dap_chain_cs_blocks_t *l_blocks = DAP_CHAIN_CS_BLOCKS(a_chain); + dap_chain_esbocs_t *l_esbocs = l_blocks->_inheritor; + dap_chain_esbocs_pvt_t * l_esbocs_pvt = PVT(l_esbocs); + l_esbocs_pvt->debug = a_enable; } static int s_callback_new(dap_chain_t *a_chain, dap_config_t *a_chain_cfg) diff --git a/modules/service/xchange/dap_chain_net_srv_xchange.c b/modules/service/xchange/dap_chain_net_srv_xchange.c index d287d6eb3f1ec5dd28e60ef47451a829cd285f43..78d77d04f2e5c32e32e3752e5acfc7387eaec426 100644 --- a/modules/service/xchange/dap_chain_net_srv_xchange.c +++ b/modules/service/xchange/dap_chain_net_srv_xchange.c @@ -269,8 +269,8 @@ int dap_chain_net_srv_xchange_init() if (s_xchange_cache_state == XCHANGE_CACHE_ENABLED){ - for(dap_chain_net_t *l_net = dap_chain_net_iter_start(); l_net; l_net=dap_chain_net_iter_next(l_net)){ - xchange_orders_cache_net_t *l_net_cache = (xchange_orders_cache_net_t *)DAP_NEW_SIZE(xchange_orders_cache_net_t, sizeof(xchange_orders_cache_net_t)); + for(dap_chain_net_t *l_net = dap_chain_net_iter_start(); l_net; l_net=dap_chain_net_iter_next(l_net)) { + xchange_orders_cache_net_t *l_net_cache = DAP_NEW_Z(xchange_orders_cache_net_t); l_net_cache->net_id.uint64 = l_net->pub.id.uint64; s_net_cache = dap_list_append(s_net_cache, l_net_cache); // dap_ledger_tx_add_notify(l_net->pub.ledger, s_ledger_tx_add_notify, NULL); @@ -3184,12 +3184,8 @@ static void s_ledger_tx_add_notify(dap_ledger_t *a_ledger, dap_chain_datum_tx_t xchange_tx_type_t l_tx_type = dap_chain_net_srv_xchange_tx_get_type(a_ledger, a_tx, &l_out_cond_item, &l_item_idx, &l_out_prev_cond_item); if (l_tx_type == TX_TYPE_UNDEFINED) return; - - xchange_tx_cache_t* l_cache = DAP_NEW_Z_SIZE(xchange_tx_cache_t, sizeof(xchange_tx_cache_t)); - if (!l_cache){ - log_it(L_CRITICAL, "%s", c_error_memory_alloc); - return; - } + + xchange_tx_cache_t* l_cache = DAP_NEW_Z_RET_IF_FAIL(xchange_tx_cache_t); l_cache->hash = *a_tx_hash; l_cache->tx = a_tx;