From e60cd674941dcdbb777f9fc3f19910f38fa2439c Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Thu, 19 Dec 2019 23:31:01 +0700
Subject: [PATCH] [*] Fix. This files has been change to work with the new
libdap-chain-common-python library.
---
include/libdap_chain_net_python.h | 2 +-
include/wrapping_dap_chain_net_node.h | 2 +-
include/wrapping_dap_chain_net_node_cli.h | 2 +-
include/wrapping_dap_chain_net_node_info.h | 2 +-
src/libdap_chain_net_python.c | 2 +-
src/wrapping_dap_chain_net_node.c | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/libdap_chain_net_python.h b/include/libdap_chain_net_python.h
index d74e8eb..378d71b 100644
--- a/include/libdap_chain_net_python.h
+++ b/include/libdap_chain_net_python.h
@@ -6,7 +6,7 @@
#include "dap_chain_net.h"
#include "wrapping_dap_chain_net_state.h"
//#include "wrapping_dap_chain_net_state.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
#include "wrapping_dap_chain_ledger.h"
#include "libdap-chain-python.h"
#include "libdap_chain_type_python.h"
diff --git a/include/wrapping_dap_chain_net_node.h b/include/wrapping_dap_chain_net_node.h
index c75727f..34fbb96 100644
--- a/include/wrapping_dap_chain_net_node.h
+++ b/include/wrapping_dap_chain_net_node.h
@@ -3,7 +3,7 @@
#include <Python.h>
#include "dap_chain_node.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
#include "libdap_chain_net_python.h"
typedef struct PyDapChainNode{
diff --git a/include/wrapping_dap_chain_net_node_cli.h b/include/wrapping_dap_chain_net_node_cli.h
index 8d02783..88bffd9 100644
--- a/include/wrapping_dap_chain_net_node_cli.h
+++ b/include/wrapping_dap_chain_net_node_cli.h
@@ -5,7 +5,7 @@
#include "dap_config.h"
#include "dap_chain_node_cli.h"
#include "dap_chain_node_cli_cmd.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
#include "wrapping_dap_chain_net_node.h"
#ifdef __cplusplus
diff --git a/include/wrapping_dap_chain_net_node_info.h b/include/wrapping_dap_chain_net_node_info.h
index 4caec25..aa49697 100644
--- a/include/wrapping_dap_chain_net_node_info.h
+++ b/include/wrapping_dap_chain_net_node_info.h
@@ -3,7 +3,7 @@
#include <Python.h>
#include "dap_chain_node.h"
#include "libdap_chain_net_python.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
#ifdef __cplusplus
extern "C" {
diff --git a/src/libdap_chain_net_python.c b/src/libdap_chain_net_python.c
index 80085f9..147ed93 100644
--- a/src/libdap_chain_net_python.c
+++ b/src/libdap_chain_net_python.c
@@ -98,7 +98,7 @@ PyObject *dap_chain_net_get_cur_addr_py(PyObject *self, PyObject *args){
}
PyObject *dap_chain_net_get_cur_cell_py(PyObject *self, PyObject *args){
PyObject *obj_cell_id = _PyObject_New(&DapChainNodeAddrObject_DapChainNodeAddrObjectType);
- ((PyDapChainCellIdObject*)obj_cell_id)->id = *(dap_chain_net_get_cur_cell(((PyDapChainNetObject*)self)->chain_net));
+ ((PyDapChainCellIDObject*)obj_cell_id)->cell_id = dap_chain_net_get_cur_cell(((PyDapChainNetObject*)self)->chain_net);
return Py_BuildValue("O", obj_cell_id);
}
PyObject *dap_chain_net_get_cur_addr_int_py(PyObject *self, PyObject *args){
diff --git a/src/wrapping_dap_chain_net_node.c b/src/wrapping_dap_chain_net_node.c
index 8f7eeaa..6dbd5e9 100644
--- a/src/wrapping_dap_chain_net_node.c
+++ b/src/wrapping_dap_chain_net_node.c
@@ -6,7 +6,7 @@ PyObject *dap_chain_node_gen_addr_py(PyObject *self, PyObject *args){
if (!PyArg_ParseTuple(args, "O|O", &obj_net, &obj_cell_id))
return NULL;
PyObject *obj_node_addr = _PyObject_New(&DapChainNodeAddrObject_DapChainNodeAddrObjectType);
- ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr = dap_chain_node_gen_addr(((PyDapChainNetObject*)obj_net)->chain_net, &(((PyDapChainCellIdObject*)obj_cell_id)->id));
+ ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr = dap_chain_node_gen_addr(((PyDapChainNetObject*)obj_net)->chain_net, &(((PyDapChainCellIDObject*)obj_cell_id)->cell_id));
return Py_BuildValue("O", obj_node_addr);
}
PyObject *dap_chain_node_check_addr_py(PyObject *self, PyObject *args){
@@ -15,7 +15,7 @@ PyObject *dap_chain_node_check_addr_py(PyObject *self, PyObject *args){
PyObject *obj_cell_id;
if (!PyArg_ParseTuple(args, "O|O|O", &obj_chain_net, &obj_node_addr, &obj_cell_id))
return NULL;
- bool ret = dap_chain_node_check_addr(((PyDapChainNetObject*)obj_chain_net)->chain_net, ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr, &(((PyDapChainCellIdObject*)obj_cell_id)->id));
+ bool ret = dap_chain_node_check_addr(((PyDapChainNetObject*)obj_chain_net)->chain_net, ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr, &(((PyDapChainCellIDObject*)obj_cell_id)->cell_id));
if (ret)
return Py_BuildValue("O", Py_True);
else
--
GitLab