diff --git a/dap_chain_cs_dag.c b/dap_chain_cs_dag.c
index 8b72d2dce83c3a068717d9d5cf7668fb2661c65a..05ae849cff171ff53d991a7ad207a20fc1e052e8 100755
--- a/dap_chain_cs_dag.c
+++ b/dap_chain_cs_dag.c
@@ -1153,18 +1153,18 @@ static int s_cli_dag(int argc, char ** argv, char **a_str_reply)
dap_string_append_printf(l_str_tmp,"\t\t\t\tsigns:\tcount: %us\n",l_event->header.signs_count);
l_offset += l_datum_size;
while (l_offset + sizeof (l_event->header) < l_event_size ){
- dap_chain_sign_t * l_sign =(dap_chain_sign_t *) (l_event->hashes_n_datum_n_signs +l_offset);
- size_t l_sign_size = dap_chain_sign_get_size(l_sign);
+ dap_sign_t * l_sign =(dap_sign_t *) (l_event->hashes_n_datum_n_signs +l_offset);
+ size_t l_sign_size = dap_sign_get_size(l_sign);
if (l_sign_size == 0 ){
dap_string_append_printf(l_str_tmp,"\t\t\t\tERROR: wrong sign size 0, stop parsing headers\n");
break;
}
- dap_enc_key_t * l_sign_key = dap_chain_sign_to_enc_key(l_sign);
+ dap_enc_key_t * l_sign_key = dap_sign_to_enc_key(l_sign);
dap_chain_addr_t l_addr = {0};
dap_chain_addr_fill(&l_addr,l_sign_key,&l_net->pub.id);
char * l_addr_str = dap_chain_addr_to_str(&l_addr);
dap_string_append_printf(l_str_tmp,"\t\t\t\t\t\ttype: %s\taddr: %s"
- "n", dap_chain_sign_type_to_str( l_sign->header.type ),
+ "n", dap_sign_type_to_str( l_sign->header.type ),
l_addr_str );
l_offset += l_sign_size;
DAP_DELETE( l_addr_str);
diff --git a/dap_chain_cs_dag_event.c b/dap_chain_cs_dag_event.c
index da010b72d02a77c8827214fb6d6f3845ec182983..d1012dd0fa0dab6f15197e7e955926f0ebbb754e 100755
--- a/dap_chain_cs_dag_event.c
+++ b/dap_chain_cs_dag_event.c
@@ -26,7 +26,7 @@
#include "dap_enc_key.h"
#include "dap_hash.h"
-#include "dap_chain_sign.h"
+#include "dap_sign.h"
#include "dap_chain_datum.h"
#include "dap_chain_cs_dag.h"
#include "dap_chain_cs_dag_event.h"
@@ -65,11 +65,11 @@ dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_new(dap_chain_id_t a_chain_id,
memcpy(l_event_new->hashes_n_datum_n_signs+l_hashes_size, a_datum,l_datum_size );
if ( a_key ){
- dap_chain_sign_t * l_sign = dap_chain_sign_create(a_key,l_event_new,
+ dap_sign_t * l_sign = dap_sign_create(a_key,l_event_new,
l_hashes_size+ sizeof(l_event_new->header)
+ l_datum_size ,0);
if ( l_sign ){
- size_t l_sign_size = dap_chain_sign_get_size(l_sign);
+ size_t l_sign_size = dap_sign_get_size(l_sign);
l_event_new = (dap_chain_cs_dag_event_t* )DAP_REALLOC(l_event_new,l_event_size+l_sign_size );
memcpy(l_event_new->hashes_n_datum_n_signs + l_hashes_size + l_datum_size, l_sign, l_sign_size);
l_event_size += l_sign_size;
@@ -111,8 +111,8 @@ dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_copy_with_sign_add( dap_chain_
{
size_t l_event_size = dap_chain_cs_dag_event_calc_size( a_event );
size_t l_event_signing_size = dap_chain_cs_dag_event_calc_size_excl_signs( a_event );
- dap_chain_sign_t * l_sign = dap_chain_sign_create(l_key,a_event,l_event_signing_size,0);
- size_t l_sign_size = dap_chain_sign_get_size(l_sign);
+ dap_sign_t * l_sign = dap_sign_create(l_key,a_event,l_event_signing_size,0);
+ size_t l_sign_size = dap_sign_get_size(l_sign);
dap_chain_cs_dag_event_t *l_event_new = DAP_NEW_Z_SIZE(dap_chain_cs_dag_event_t, l_event_size+l_sign_size);
memcpy(l_event_new, a_event,l_event_size);
memcpy(l_event_new+l_event_size,l_sign,l_sign_size);
@@ -126,7 +126,7 @@ dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_copy_with_sign_add( dap_chain_
* @param a_sign_number
* @return
*/
-dap_chain_sign_t * dap_chain_cs_dag_event_get_sign( dap_chain_cs_dag_event_t * a_event, uint16_t a_sign_number)
+dap_sign_t * dap_chain_cs_dag_event_get_sign( dap_chain_cs_dag_event_t * a_event, uint16_t a_sign_number)
{
if (a_event->header.signs_count > a_sign_number ){
size_t l_offset_to_sign = dap_chain_cs_dag_event_calc_size_excl_signs(a_event);
@@ -134,10 +134,10 @@ dap_chain_sign_t * dap_chain_cs_dag_event_get_sign( dap_chain_cs_dag_event_t * a
uint16_t l_signs_offset = 0;
uint16_t l_signs_passed;
for ( l_signs_passed=0; l_signs_passed < a_sign_number; l_signs_passed++){
- dap_chain_sign_t * l_sign = (dap_chain_sign_t *) (l_signs+l_signs_offset);
+ dap_sign_t * l_sign = (dap_sign_t *) (l_signs+l_signs_offset);
l_signs_offset+=l_sign->header.sign_pkey_size+l_sign->header.sign_size+sizeof(l_sign->header);
}
- return (dap_chain_sign_t*) l_signs + l_signs_offset;
+ return (dap_sign_t*) l_signs + l_signs_offset;
}else
return NULL;
}
diff --git a/dap_chain_cs_dag_event.h b/dap_chain_cs_dag_event.h
index b42000dd2d0a2fc0825938ce282af0af7d9b0a07..39b898d9b1e9123e8ed62b068287a85a0c31d3e6 100755
--- a/dap_chain_cs_dag_event.h
+++ b/dap_chain_cs_dag_event.h
@@ -26,7 +26,7 @@
#include "dap_enc_key.h"
#include "dap_chain_common.h"
#include "dap_chain_datum.h"
-#include "dap_chain_sign.h"
+#include "dap_sign.h"
#include "dap_hash.h"
typedef struct dap_chain_cs_dag dap_chain_cs_dag_t;
@@ -67,7 +67,7 @@ dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_copy(dap_chain_cs_dag_event_t
// Important: returns new deep copy of event
dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_copy_with_sign_add( dap_chain_cs_dag_event_t * a_event, dap_enc_key_t * l_key);
-dap_chain_sign_t * dap_chain_cs_dag_event_get_sign( dap_chain_cs_dag_event_t * a_event, uint16_t a_sign_number);
+dap_sign_t * dap_chain_cs_dag_event_get_sign( dap_chain_cs_dag_event_t * a_event, uint16_t a_sign_number);
/**
* @brief dap_chain_cs_dag_event_calc_size
@@ -87,7 +87,7 @@ static inline size_t dap_chain_cs_dag_event_calc_size(dap_chain_cs_dag_event_t *
uint16_t l_signs_offset = 0;
uint16_t l_signs_passed;
for ( l_signs_passed=0; l_signs_passed < a_event->header.signs_count; l_signs_passed++){
- dap_chain_sign_t * l_sign = (dap_chain_sign_t *) l_signs+l_signs_offset;
+ dap_sign_t * l_sign = (dap_sign_t *) l_signs+l_signs_offset;
l_signs_offset+=l_sign->header.sign_pkey_size+l_sign->header.sign_size+sizeof(l_sign->header);
}