From 93c7ebb02a9e2a34f6ad2c3140c0c1822466ffb1 Mon Sep 17 00:00:00 2001
From: "daniil.frolov" <daniil.frolov@demlabs.net>
Date: Thu, 7 Sep 2023 12:40:23 +0700
Subject: [PATCH] fix some minore bugs
---
modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c | 6 +++---
modules/net/srv/dap_chain_net_srv.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
index 9f7a128ec9..3dba9b0143 100644
--- a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
+++ b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
@@ -526,7 +526,7 @@ static void s_grace_period_start(dap_chain_net_srv_grace_t *a_grace)
continue;
}
- if (l_price_tmp->units_uid.enm == l_tx_out_cond->subtype.srv_pay.unit.enm){
+ if (l_price_tmp->units_uid.enm != l_tx_out_cond->subtype.srv_pay.unit.enm){
log_it( L_WARNING, "Unit ID in the pricelist and tx do not match");
continue;
}
@@ -539,7 +539,7 @@ static void s_grace_period_start(dap_chain_net_srv_grace_t *a_grace)
continue;
}
- if(!compare256(uint256_0, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) ||
+ if(IS_ZERO_256(l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) ||
compare256(l_unit_price, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) <= 0){
l_price = l_price_tmp;
break;
@@ -749,7 +749,7 @@ static bool s_grace_period_finish(usages_in_grace_t *a_grace_item)
continue;
}
- if(!compare256(uint256_0, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) ||
+ if(IS_ZERO_256(l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) ||
compare256(l_unit_price, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) <= 0){
l_price = l_price_tmp;
break;
diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c
index a0d632a38e..a5332bc777 100644
--- a/modules/net/srv/dap_chain_net_srv.c
+++ b/modules/net/srv/dap_chain_net_srv.c
@@ -871,7 +871,7 @@ int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, cons
dap_stpcpy(l_price->token, l_order->price_ticker);
l_price->units = l_order->units;
l_price->units_uid = l_order->price_unit;
- if (compare256(l_max_price, uint256_0)){
+ if (!IS_ZERO_256(l_max_price)){
uint256_t l_price_unit = uint256_0;
DIV_256(l_price->value_datoshi, GET_256_FROM_64(l_order->units), &l_price_unit);
if (compare256(l_price_unit, l_max_price)>0){
--
GitLab