diff --git a/modules/cellframe-sdk/common/include/wrapping_dap_chain_common.h b/modules/cellframe-sdk/common/include/wrapping_dap_chain_common.h index 7fb7eaa898c242986992401108071c1d0f5f6126..0a5e479e12887d7d9ea423d8f74c21ee5d3e07b6 100644 --- a/modules/cellframe-sdk/common/include/wrapping_dap_chain_common.h +++ b/modules/cellframe-sdk/common/include/wrapping_dap_chain_common.h @@ -88,7 +88,7 @@ typedef struct PyDapChainNetSrvUID{ }PyDapChainNetSrvUIDObject; int PyDapChainNetSrvUIDObject_init(PyObject *self, PyObject *args, PyObject *kwds); -PyObject* PyDapChainNetSrvUIDObject_str(PyDapChainNetSrvUIDObject *self); +PyObject* PyDapChainNetSrvUIDObject_str(PyObject *self); extern PyTypeObject DapChainNetSrvUIDObject_DapChainNetSrvUIDObjectType; diff --git a/modules/cellframe-sdk/common/src/wrapping_dap_chain_common.c b/modules/cellframe-sdk/common/src/wrapping_dap_chain_common.c index 9f4aed05b8893032386f0482a4315e908266a733..45ff67911b004badd94570239afc04a38f25e599 100644 --- a/modules/cellframe-sdk/common/src/wrapping_dap_chain_common.c +++ b/modules/cellframe-sdk/common/src/wrapping_dap_chain_common.c @@ -603,7 +603,7 @@ PyObject* PyDapChainNodeAddrObject_str(PyObject* self){ } /* wrapping dap_chain_net_srv_uid_t */ -PyObject* PyDapChainNetSrvUIDObject_str(PyDapChainNetSrvUIDObject *self){ +PyObject* PyDapChainNetSrvUIDObject_str(PyObject *self){ char *res = dap_strdup_printf("0x%016"DAP_UINT64_FORMAT_X, ((PyDapChainNetSrvUIDObject*)self)->net_srv_uid.uint64); return Py_BuildValue("s", res); } diff --git a/modules/cellframe-sdk/net/include/libdap_chain_net_python.h b/modules/cellframe-sdk/net/include/libdap_chain_net_python.h index b5cd8590aa1536e6f4c9ae0ecc5e939618ea1165..040e7dc0d7fa0ee506594c55e2f15f02549ac9b4 100644 --- a/modules/cellframe-sdk/net/include/libdap_chain_net_python.h +++ b/modules/cellframe-sdk/net/include/libdap_chain_net_python.h @@ -83,7 +83,7 @@ PyObject *dap_chain_net_add_notify_py(PyObject *self, PyObject *args); extern PyTypeObject DapChainNetObject_DapChainNetObjectType; -static bool PyDapChainNet_Check(PyObject *self){ +static bool PyDapChainNet_Check(PyDapChainNetObject *self){ return PyObject_TypeCheck(self, &DapChainNetObject_DapChainNetObjectType); } diff --git a/modules/cellframe-sdk/net/src/libdap_chain_net_python.c b/modules/cellframe-sdk/net/src/libdap_chain_net_python.c index a9396ea63fc46086b3dc7fa824d282a4b0e125cb..d020ae021842710697cc02a08001ae922ae909aa 100644 --- a/modules/cellframe-sdk/net/src/libdap_chain_net_python.c +++ b/modules/cellframe-sdk/net/src/libdap_chain_net_python.c @@ -299,7 +299,7 @@ PyObject *dap_chain_net_add_notify_py(PyObject *self, PyObject *args){ for(pvt_wrapping_dap_chain_net_notify_callback_list_t *list = pvt_list_notify; list != NULL; list = list->next){ if (list->net == ((PyDapChainNetObject*)self)->chain_net) break; - dap_chain_net_add_notify_callback(((PyDapChainNetObject*)self)->chain_net, pvt_dap_chain_net_py_notify_handler); + dap_chain_net_add_gdb_notify_callback(((PyDapChainNetObject*)self)->chain_net, pvt_dap_chain_net_py_notify_handler, NULL); } pvt_wrapping_dap_chain_net_notify_callback_list_t *l_element = DAP_NEW(pvt_wrapping_dap_chain_net_notify_callback_list_t); l_element->net = ((PyDapChainNetObject*)self)->chain_net; diff --git a/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_common.c b/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_common.c index 26030ed8b13f8765bffd1d9463682d4eaa612d9c..66341ca49af6305bc26fa797fec0021df7b98d0e 100644 --- a/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_common.c +++ b/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_common.c @@ -58,7 +58,7 @@ PyTypeObject DapChainNetSrvPriceObject_DapChainNetSrvPriceObjectType = { PyObject *wrapping_dap_chain_net_srv_get_wallet(PyObject *self, void *closure){ (void)closure; - + return NULL; } PyObject *wrapping_dap_chain_net_srv_get_net_name(PyObject *self, void *closure){ (void)closure; diff --git a/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_order.c b/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_order.c index 2526ce34e21641bf227289300dbdc4ab610cd32b..31f013b997d3942e958ef6b7a11f38935b80db2e 100644 --- a/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_order.c +++ b/modules/cellframe-sdk/net/srv/src/wrapping_dap_chain_net_srv_order.c @@ -132,7 +132,7 @@ int PyDapChainNetSrvOrder_init(PyDapChainNetSrvOrderObject *self, PyObject *args char *price_ticker; unsigned long expires; PyObject *obj_ext, *obj_key; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOOkOsOOO", kwlist, &obj_net, &obj_direction, &obj_srv_uid, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOOkOsOOO", (char **)kwlist, &obj_net, &obj_direction, &obj_srv_uid, &obj_node_addr, &obj_tx_cond_hash, &price, &obj_price_unit, &price_ticker, &expires, &obj_ext, &obj_key)){ return -1; @@ -364,7 +364,7 @@ PyObject *wrapping_dap_chain_net_srv_order_find(PyObject *self, PyObject *args){ PyObject *wrapping_dap_chain_net_srv_order_delete(PyObject *self, PyObject *args){ (void)self; PyObject *obj_net; - PyObject *obj_order_hash; + PyDapHashFastObject *obj_order_hash; if (!PyArg_ParseTuple(args, "OO", &obj_net, &obj_order_hash)){ PyErr_SetString(PyExc_ValueError, "This function must take two arguments. "); return NULL; @@ -392,7 +392,10 @@ PyObject *wrapping_dap_chain_net_srv_order_delete(PyObject *self, PyObject *args return NULL; } -PyObject *wrapping_dap_chain_net_srv_order_find_all_by(PyObject *self, PyObject *args){} +PyObject *wrapping_dap_chain_net_srv_order_find_all_by(PyObject *self, PyObject *args){ + return NULL; +} + PyObject *wrapping_dap_chain_net_srv_order_save(PyObject *self, PyObject *args){ PyObject *obj_net; if(!PyArg_ParseTuple(args, "O", &obj_net)){ @@ -460,7 +463,7 @@ PyObject *wrapping_dap_chain_net_srv_order_add_notify_callback(PyObject *self, P _wrapping_list_func_callables_t *callback = DAP_NEW(_wrapping_list_func_callables_t); callback->func = func_call; dap_chain_net_srv_order_add_notify_callback(((PyDapChainNetObject*)obj_net)->chain_net, - _wrapping_handler_add_order_notify); + _wrapping_handler_add_order_notify, NULL); LL_APPEND(_s_callbacks, callback); return Py_None; }