From 2b326bbd9282379afe4e25f7b2fe2c477dccfe38 Mon Sep 17 00:00:00 2001
From: "dmitriy.gerasimov" <naeper@demlabs.net>
Date: Sat, 23 May 2020 19:15:05 +0000
Subject: [PATCH] Revert "Merge branch 'revert-062fdf95' into 'master'"
This reverts merge request !73
---
modules/chain/dap_chain_ledger.c | 6 +++---
modules/net/dap_chain_node_cli.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/chain/dap_chain_ledger.c b/modules/chain/dap_chain_ledger.c
index 586300de97..a08b3ea2fa 100644
--- a/modules/chain/dap_chain_ledger.c
+++ b/modules/chain/dap_chain_ledger.c
@@ -252,7 +252,7 @@ int dap_chain_ledger_token_add(dap_ledger_t * a_ledger, dap_chain_datum_token_t
switch(a_token->type){
case DAP_CHAIN_DATUM_TOKEN_TYPE_SIMPLE:
l_token_item->total_supply = a_token->header_private.total_supply;
- log_it( L_NOTICE, "Private token %s added (total_supply = %.1llf signs_valid=%hu signs_total=%hu type=DAP_CHAIN_DATUM_TOKEN_PRIVATE )",
+ log_it( L_NOTICE, "Private token %s added (total_supply = %.1llf total_signs_valid=%hu signs_total=%hu type=DAP_CHAIN_DATUM_TOKEN_PRIVATE )",
a_token->ticker, dap_chain_balance_to_coins(a_token->header_private.total_supply),
a_token->header_private.signs_valid, a_token->header_private.signs_total);
break;
@@ -333,7 +333,7 @@ int dap_chain_ledger_token_emission_add_check(dap_ledger_t *a_ledger, const dap_
HASH_FIND(hh,l_token_item ? l_token_item->token_emissions : l_ledger_priv->treshold_emissions,
&l_token_emission_hash, sizeof(l_token_emission_hash), l_token_emission_item);
if(l_token_emission_item ) {
- log_it(L_ERROR, "Can't add token emission datum of %llu %s ( 0x%s ): already present in cache",
+ log_it(L_ERROR, "Can't add token emission datum of %llu %s ( %s ): already present in cache",
a_token_emission->hdr.value, c_token_ticker, l_hash_str);
ret = -1;
}else if ( (! l_token_item) && ( HASH_COUNT( l_ledger_priv->treshold_emissions) >= s_treshold_emissions_max )) {
@@ -412,7 +412,7 @@ int dap_chain_ledger_token_emission_add(dap_ledger_t *a_ledger,
ret = -2;
}
} else {
- log_it(L_ERROR, "Can't add token emission datum of %llu %s ( 0x%s )",
+ log_it(L_ERROR, "Can't add token emission datum of %llu %s ( %s )",
a_token_emission->hdr.value, c_token_ticker, l_hash_str);
ret = -1;
}
diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c
index 7a49b20101..bca667bbdf 100644
--- a/modules/net/dap_chain_node_cli.c
+++ b/modules/net/dap_chain_node_cli.c
@@ -831,7 +831,7 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
"\t -flags_set <value>:\t Set list of flags from <value> to token declaration\n"
"\t -flags_unset <value>:\t Unset list of flags from <value> from token declaration\n"
"\t -total_supply <value>:\t Set total supply - emission's maximum - to the <value>\n"
- "\t -signs_valid <value>:\t Set valid signatures count's minimum\n"
+ "\t -total_signs_valid <value>:\t Set valid signatures count's minimum\n"
"\t -signs_add <value>:\t Add signature's pkey fingerprint to the list of owners\n"
"\t -signs_remove <value>:\t Remove signature's pkey fingerprint from the owners\n"
"\nDatum type allowed/blocked updates:\n"
@@ -895,7 +895,7 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
"General:\n"
"\t -flags <value>:\t List of flags from <value> to token declaration\n"
"\t -total_supply <value>:\t Set total supply - emission's maximum - to the <value>\n"
- "\t -signs_valid <value>:\t Set valid signatures count's minimum\n"
+ "\t -total_signs_valid <value>:\t Set valid signatures count's minimum\n"
"\t -signs <value>:\t Signature's fingerprint list\n"
"\nDatum type allowed/blocked:\n"
"\t -datum_type_allowed <value>:\t Set allowed datum type(s)\n"
--
GitLab