From 902eac506a6d85930f0f1d6b34f29fccf628b397 Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Wed, 15 May 2024 10:41:30 +0300
Subject: [PATCH] [*] Cluster role -> cluster type rename
---
dap-sdk | 2 +-
modules/consensus/dag-poa/dap_chain_cs_dag_poa.c | 2 +-
modules/consensus/esbocs/dap_chain_cs_esbocs.c | 2 +-
modules/net/dap_chain_net.c | 8 ++++----
modules/type/none/dap_chain_cs_none.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index 69906d6e84..48ad279825 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 69906d6e84f3436e8e85d1534a8b32cb69ea0ce6
+Subproject commit 48ad279825c269200cb4a86c36d32d9bf15f2949
diff --git a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
index e2b71eb69f..b4ed565db5 100644
--- a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
+++ b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
@@ -740,7 +740,7 @@ static int s_callback_created(dap_chain_t * a_chain, dap_config_t *a_chain_net_c
dap_global_db_cluster_t *l_dag_cluster = dap_global_db_cluster_add(dap_global_db_instance_get_default(), NULL,
dap_guuid_compose(l_net->pub.id.uint64, DAP_CHAIN_CLUSTER_ID_DAG),
l_dag->gdb_group_events_round_new, 900, true,
- DAP_GDB_MEMBER_ROLE_NOBODY, DAP_CLUSTER_ROLE_AUTONOMIC);
+ DAP_GDB_MEMBER_ROLE_NOBODY, DAP_CLUSTER_TYPE_AUTONOMIC);
dap_global_db_cluster_add_notify_callback(l_dag_cluster, s_round_changes_notify, l_dag);
dap_chain_net_add_auth_nodes_to_cluster(l_net, l_dag_cluster);
dap_link_manager_add_net_associate(l_net->pub.id.uint64, l_dag_cluster->links_cluster);
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index f1883e4123..5a74043e2b 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -525,7 +525,7 @@ static int s_callback_created(dap_chain_t *a_chain, dap_config_t *a_chain_net_cf
l_session->db_cluster = dap_global_db_cluster_add(dap_global_db_instance_get_default(), NULL,
dap_guuid_compose(l_net->pub.id.uint64, DAP_CHAIN_CLUSTER_ID_ESBOCS),
l_sync_group, 72 * 3600, true,
- DAP_GDB_MEMBER_ROLE_NOBODY, DAP_CLUSTER_ROLE_AUTONOMIC);
+ DAP_GDB_MEMBER_ROLE_NOBODY, DAP_CLUSTER_TYPE_AUTONOMIC);
DAP_DELETE(l_sync_group);
dap_global_db_cluster_add_notify_callback(l_session->db_cluster, s_db_change_notifier, l_session);
#endif
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 4836034886..c214348e96 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2234,7 +2234,7 @@ bool s_net_load(void *a_arg)
l_net->pub.name, dap_guuid_compose(l_net->pub.id.uint64, 0),
l_gdb_groups_mask, DAP_CHAIN_NET_MEMPOOL_TTL, true,
DAP_GDB_MEMBER_ROLE_USER,
- DAP_CLUSTER_ROLE_EMBEDDED);
+ DAP_CLUSTER_TYPE_EMBEDDED);
if (!l_cluster) {
log_it(L_ERROR, "Can't initialize mempool cluster for network %s", l_net->pub.name);
l_err_code = -2;
@@ -2251,7 +2251,7 @@ bool s_net_load(void *a_arg)
l_net->pub.name, dap_guuid_compose(l_net->pub.id.uint64, 0),
l_gdb_groups_mask, 0, true,
DAP_GDB_MEMBER_ROLE_GUEST,
- DAP_CLUSTER_ROLE_EMBEDDED);
+ DAP_CLUSTER_TYPE_EMBEDDED);
if (!l_net_pvt->orders_cluster) {
log_it(L_ERROR, "Can't initialize orders cluster for network %s", l_net->pub.name);
goto ret;
@@ -2265,7 +2265,7 @@ bool s_net_load(void *a_arg)
l_net->pub.name, dap_guuid_compose(l_net->pub.id.uint64, 0),
l_gdb_groups_mask, 0, true,
DAP_GDB_MEMBER_ROLE_USER,
- DAP_CLUSTER_ROLE_EMBEDDED);
+ DAP_CLUSTER_TYPE_EMBEDDED);
DAP_DELETE(l_gdb_groups_mask);
// Nodes and its aliases cluster
l_net->pub.gdb_nodes = dap_strdup_printf("%s.nodes.list",l_net->pub.gdb_groups_prefix);
@@ -2273,7 +2273,7 @@ bool s_net_load(void *a_arg)
l_net->pub.name, dap_guuid_compose(l_net->pub.id.uint64, 0),
l_net->pub.gdb_nodes, 0, true,
DAP_GDB_MEMBER_ROLE_GUEST,
- DAP_CLUSTER_ROLE_EMBEDDED);
+ DAP_CLUSTER_TYPE_EMBEDDED);
if (!l_net_pvt->nodes_cluster) {
log_it(L_ERROR, "Can't initialize nodes cluster for network %s", l_net->pub.name);
l_err_code = -3;
diff --git a/modules/type/none/dap_chain_cs_none.c b/modules/type/none/dap_chain_cs_none.c
index 4c484f573b..8a570258a6 100644
--- a/modules/type/none/dap_chain_cs_none.c
+++ b/modules/type/none/dap_chain_cs_none.c
@@ -169,7 +169,7 @@ static int s_cs_callback_new(dap_chain_t *a_chain, dap_config_t UNUSED_ARG *a_ch
dap_global_db_cluster_add(dap_global_db_instance_get_default(),
l_net->pub.name, dap_guuid_compose(l_net->pub.id.uint64, 0),
l_nochain_priv->group_datums, 0,
- true, DAP_GDB_MEMBER_ROLE_USER, DAP_CLUSTER_ROLE_EMBEDDED);
+ true, DAP_GDB_MEMBER_ROLE_USER, DAP_CLUSTER_TYPE_EMBEDDED);
if (!l_nonconsensus_cluster) {
log_it(L_ERROR, "Can't create global DB cluster for synchronization");
return -3;
--
GitLab