diff --git a/cellframe-sdk b/cellframe-sdk index 1ec41004a5e508c6d250ebc0d67c9e52a2aa76bc..8477d1c289c036a9c2cc41471285a19d244e5e80 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 1ec41004a5e508c6d250ebc0d67c9e52a2aa76bc +Subproject commit 8477d1c289c036a9c2cc41471285a19d244e5e80 diff --git a/modules/cellframe-sdk/chain/src/libdap-chain-python.c b/modules/cellframe-sdk/chain/src/libdap-chain-python.c index acbf5d0d3452f6c89a65cc53ab1f640bb04e595c..7b86828488621d64219ba472bcbdf34d5fc95a88 100644 --- a/modules/cellframe-sdk/chain/src/libdap-chain-python.c +++ b/modules/cellframe-sdk/chain/src/libdap-chain-python.c @@ -83,7 +83,8 @@ PyObject *dap_chain_load_from_cfg_py(PyObject *self, PyObject *args){ if (!PyArg_ParseTuple(args, "s|O|s", &chain_net_name, &obj_net_id, &cfg_name)) return NULL; PyObject *res_obj = _PyObject_New(&DapChainObjectType); - ((PyDapChainObject*)res_obj)->chain_t = dap_chain_load_from_cfg(chain_net_name, ((PyDapChainNetIdObject*)obj_net_id)->net_id, cfg_name); + dap_config_t *l_chain_config = dap_config_open(cfg_name); + ((PyDapChainObject*)res_obj)->chain_t = dap_chain_load_from_cfg(chain_net_name, ((PyDapChainNetIdObject*)obj_net_id)->net_id, l_chain_config); return Py_BuildValue("O", &res_obj); } diff --git a/modules/dap-sdk/net/server/json_rpc/src/wrapping_json_rpc_response.c b/modules/dap-sdk/net/server/json_rpc/src/wrapping_json_rpc_response.c index cdf60df2fa70ae6e035c0338a9f0d726403cc491..d41190373e7bb115348edbf7f284e9a866172b83 100644 --- a/modules/dap-sdk/net/server/json_rpc/src/wrapping_json_rpc_response.c +++ b/modules/dap-sdk/net/server/json_rpc/src/wrapping_json_rpc_response.c @@ -6,7 +6,7 @@ static PyGetSetDef PyDapJSONRPCResponseGetsSets[] = { {"ID", (getter)wrapping_json_rpc_response_get_id, NULL, "ID request", NULL}, - {"Error", (getter)wrapping_json_rpc_response_get_error, (setter)wrapping_json_rpc_response_set_error, "", NULL }, + // {"Error", (getter)wrapping_json_rpc_response_get_error, (setter)wrapping_json_rpc_response_set_error, "", NULL }, {"Result", (getter)wrapping_json_rpc_response_get_result, (setter)wrapping_json_rpc_response_set_result, "", NULL}, {} }; @@ -73,20 +73,20 @@ PyObject *wrapping_json_rpc_response_get_result(PyObject *self, void *closure){ } Py_RETURN_NONE; } -PyObject *wrapping_json_rpc_response_get_error(PyObject *self, void *closure){ - UNUSED(closure); - dap_json_rpc_response_t* l_resp = ((PyDapJSONRPCResponseObject*)self)->response; - if (l_resp->json_arr_errors) { - for (size_t i = 0; i < json_object_array_length(l_resp->json_arr_errors); i++) { - json_object * a_jobj = json_object_array_get_idx(l_resp->json_arr_errors, i); - json_object *l_jobj_code_eror = json_object_object_get(a_jobj, "code"); - json_object *l_jobj_msg = json_object_object_get(a_jobj, "message"); - //TODO make a touple return - return Py_BuildValue("is", json_object_get_string(l_jobj_code_eror), json_object_get_string(l_jobj_msg)); - } - } - return PyTuple_New(2); -} +// PyObject *wrapping_json_rpc_response_get_error(PyObject *self, void *closure){ +// UNUSED(closure); +// dap_json_rpc_response_t* l_resp = ((PyDapJSONRPCResponseObject*)self)->response; +// if (l_resp->json_arr_errors) { +// for (size_t i = 0; i < json_object_array_length(l_resp->json_arr_errors); i++) { +// json_object * a_jobj = json_object_array_get_idx(l_resp->json_arr_errors, i); +// json_object *l_jobj_code_eror = json_object_object_get(a_jobj, "code"); +// json_object *l_jobj_msg = json_object_object_get(a_jobj, "message"); +// //TODO make a touple return +// return Py_BuildValue("is", json_object_get_string(l_jobj_code_eror), json_object_get_string(l_jobj_msg)); +// } +// } +// return PyTuple_New(2); +// } int wrapping_json_rpc_response_set_error(PyObject *self, PyObject *args, void *closure){ UNUSED(closure);