Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
16
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-sdk
Commits
27a44e8d
Commit
27a44e8d
authored
6 months ago
by
Constantin P.
💬
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugfix-12725' into 'master'
Bugfix 12725 See merge request
!1796
parents
163c9983
ac2616bf
No related branches found
No related tags found
1 merge request
!1796
Bugfix 12725
Pipeline
#44245
failed with stage
Stage: build
in 17 minutes and 46 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dap-sdk
+1
-1
1 addition, 1 deletion
dap-sdk
modules/net/dap_chain_net_decree.c
+2
-2
2 additions, 2 deletions
modules/net/dap_chain_net_decree.c
with
3 additions
and
3 deletions
dap-sdk
@
70cffb96
Compare
9e7565c9
...
70cffb96
Subproject commit
9e7565c9417bad979e90b83ccd537aecfe7c07f9
Subproject commit
70cffb96e4be3972625268f3d4f972bb337a87a3
This diff is collapsed.
Click to expand it.
modules/net/dap_chain_net_decree.c
+
2
−
2
View file @
27a44e8d
...
...
@@ -137,7 +137,7 @@ static int s_decree_verify(dap_chain_net_t *a_net, dap_chain_datum_decree_t *a_d
decree_table_t
**
l_decrees
=
dap_chain_net_get_decrees
(
a_net
),
*
l_sought_decree
=
NULL
;
HASH_FIND
(
hh
,
*
l_decrees
,
a_decree_hash
,
sizeof
(
dap_hash_fast_t
),
l_sought_decree
);
if
(
l_sought_decree
&&
l_sought_decree
->
decree
)
{
log_it
(
L_WARNING
,
"Decree with hash %s is already present"
,
dap_hash_fast_to_str_static
(
a_decree_hash
));
debug_if
(
s_debug_more
,
L_WARNING
,
"Decree with hash %s is already present"
,
dap_hash_fast_to_str_static
(
a_decree_hash
));
return
-
123
;
}
...
...
@@ -270,7 +270,7 @@ int dap_chain_net_decree_apply(dap_hash_fast_t *a_decree_hash, dap_chain_datum_d
}
}
else
{
// Process decree itself
if
(
l_new_decree
->
decree
)
{
log_it
(
L_WARNING
,
"Decree with hash %s is already present"
,
dap_hash_fast_to_str_static
(
a_decree_hash
));
debug_if
(
s_debug_more
,
L_WARNING
,
"Decree with hash %s is already present"
,
dap_hash_fast_to_str_static
(
a_decree_hash
));
return
-
123
;
}
l_new_decree
->
decree
=
a_chain
->
is_mapped
?
a_decree
:
DAP_DUP_SIZE
(
a_decree
,
dap_chain_datum_decree_get_size
(
a_decree
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment