From 06c179a61fbc98b0554c3823dc66490f49f61f05 Mon Sep 17 00:00:00 2001
From: "aleksei.voronin" <aleksei.voronin@demlabs.net>
Date: Wed, 27 May 2020 13:09:27 +0300
Subject: [PATCH] [*] fixed naming for default_chain
---
modules/mempool/dap_chain_mempool.c | 4 ++--
modules/net/dap_chain_net.c | 8 ++++----
modules/net/include/dap_chain_net.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c
index 8cc95901e3..c51072d283 100644
--- a/modules/mempool/dap_chain_mempool.c
+++ b/modules/mempool/dap_chain_mempool.c
@@ -658,8 +658,8 @@ dap_chain_hash_fast_t* dap_chain_proc_tx_create_cond(dap_chain_net_t * a_net,
{
dap_chain_t *l_chain = NULL;
- if(a_net->pub.default_tx_chain)
- l_chain = a_net->pub.default_tx_chain;
+ if(a_net->pub.default_chain)
+ l_chain = a_net->pub.default_chain;
else
dap_chain_net_get_chain_by_chain_type(a_net, CHAIN_TYPE_TX);
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index c5c52f1baa..0864c057da 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -1661,11 +1661,11 @@ int s_net_load(const char * a_net_name)
}
dap_list_free(l_prior_list);
- const char* l_default_tx_chain_name = dap_config_get_item_str(l_cfg , "general" , "default_tx_chain");
- if(l_default_tx_chain_name)
- l_net->pub.default_tx_chain = dap_chain_net_get_chain_by_name(l_net, l_default_tx_chain_name);
+ const char* l_default_chain_name = dap_config_get_item_str(l_cfg , "general" , "default_chain");
+ if(l_default_chain_name)
+ l_net->pub.default_chain = dap_chain_net_get_chain_by_name(l_net, l_default_chain_name);
else
- l_net->pub.default_tx_chain = NULL;
+ l_net->pub.default_chain = NULL;
} else {
log_it(L_ERROR,"Can't any chains for network %s",l_net->pub.name);
diff --git a/modules/net/include/dap_chain_net.h b/modules/net/include/dap_chain_net.h
index d174d83a27..3465ff818a 100644
--- a/modules/net/include/dap_chain_net.h
+++ b/modules/net/include/dap_chain_net.h
@@ -75,7 +75,7 @@ typedef struct dap_chain_net{
char * gdb_nodes;
dap_chain_t * chains; // double-linked list of chains
- dap_chain_t * default_tx_chain;
+ dap_chain_t * default_chain;
dap_ledger_t *ledger;
} pub;
uint8_t pvt[];
--
GitLab