From 77b6d66d8d3a1bed4479be451ec1f6ae54794026 Mon Sep 17 00:00:00 2001
From: "daniil.frolov" <daniil.frolov@demlabs.net>
Date: Fri, 31 May 2024 17:01:32 +0700
Subject: [PATCH] ..
---
modules/type/blocks/dap_chain_cs_blocks.c | 2 +-
.../type/blocks/tests/dap_chain_blocks_test.c | 24 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index f7beb00efe..58655503a9 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -1696,7 +1696,7 @@ static dap_chain_atom_verify_res_t s_callback_atom_add(dap_chain_t * a_chain, da
l_prev_bcache->forked_branches = dap_list_append(l_prev_bcache->forked_branches, &PVT(l_blocks)->forked_branches[PVT(l_blocks)->forked_br_cnt-1]);
pthread_rwlock_unlock(& PVT(l_blocks)->rwlock);
debug_if(s_debug_more, L_DEBUG, "Fork is made successfuly.");
- return ATOM_ACCEPT;
+ return ATOM_FORK;
}
pthread_rwlock_unlock(& PVT(l_blocks)->rwlock);
return ATOM_REJECT;
diff --git a/modules/type/blocks/tests/dap_chain_blocks_test.c b/modules/type/blocks/tests/dap_chain_blocks_test.c
index e0972631fd..9a8a9db06e 100644
--- a/modules/type/blocks/tests/dap_chain_blocks_test.c
+++ b/modules/type/blocks/tests/dap_chain_blocks_test.c
@@ -1,4 +1,3 @@
-#include "dap_chain_cs_blocks.h"
#include "dap_test.h"
#include "dap_config.h"
#include "dap_chain_net.h"
@@ -7,6 +6,7 @@
#include "dap_chain_cs_blocks.h"
#include "dap_chain_cs_esbocs.h"
#include "dap_chain_cs.h"
+// #include "dap_chain_cs_blocks.h"
void dap_chain_blocks_test()
{
@@ -64,10 +64,10 @@ void dap_chain_blocks_test()
// dap_test_msg("Add forked block from %s", dap_chain_hash_fast_to_str_static(&l_forked_block_hash));
l_block_size = 0;
l_block = dap_chain_block_new(&l_forked_block_hash, &l_block_size);
- // dap_assert_PIF(l_block != NULL, "Creating of forked block:");
+ dap_assert_PIF(l_block != NULL, "Creating of forked block:");
dap_hash_fast(l_block, l_block_size, &l_block_hash);
// dap_test_msg("Created block %s", dap_chain_hash_fast_to_str_static(&l_block_hash));
- dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_ACCEPT, "Adding of forked block: ");
+ dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_FORK, "Adding of forked block: ");
l_block_hash_copy = DAP_DUP(&l_block_hash);
l_second_branch_atoms_list = dap_list_append(l_second_branch_atoms_list, l_block_hash_copy);
@@ -87,10 +87,10 @@ void dap_chain_blocks_test()
// dap_test_msg("Add block to forked branch");
l_block_size = 0;
l_block = dap_chain_block_new(&l_block_hash, &l_block_size);
- // dap_assert_PIF(l_block != NULL, "Creating of forked block:");
+ dap_assert_PIF(l_block != NULL, "Creating of forked block:");
dap_hash_fast(l_block, l_block_size, &l_block_hash);
// dap_test_msg("Created block %s", dap_chain_hash_fast_to_str_static(&l_block_hash));
- dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_ACCEPT, "Adding of forked block: ");
+ dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_FORK, "Adding of forked block: ");
l_block_hash_copy = DAP_DUP(&l_block_hash);
l_second_branch_atoms_list = dap_list_append(l_second_branch_atoms_list, l_block_hash_copy);
@@ -105,10 +105,10 @@ void dap_chain_blocks_test()
// dap_test_msg("Add block to forked branch");
l_block_size = 0;
l_block = dap_chain_block_new(&l_block_hash, &l_block_size);
- // dap_assert_PIF(l_block != NULL, "Creating of forked block:");
+ dap_assert_PIF(l_block != NULL, "Creating of forked block:");
dap_hash_fast(l_block, l_block_size, &l_block_hash);
// dap_test_msg("Created block %s", dap_chain_hash_fast_to_str_static(&l_block_hash));
- dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_ACCEPT, "Adding of forked block: ");
+ dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_FORK, "Adding of forked block: ");
l_block_hash_copy = DAP_DUP(&l_block_hash);
l_second_branch_atoms_list = dap_list_append(l_second_branch_atoms_list, l_block_hash_copy);
@@ -123,10 +123,10 @@ void dap_chain_blocks_test()
// dap_test_msg("Add block to former main branch");
l_block_size = 0;
l_block = dap_chain_block_new((dap_hash_fast_t*)dap_list_last(l_first_branch_atoms_list)->data, &l_block_size);
- // dap_assert_PIF(l_block != NULL, "Creating of forked block:");
+ dap_assert_PIF(l_block != NULL, "Creating of forked block:");
dap_hash_fast(l_block, l_block_size, &l_block_hash);
// dap_test_msg("Created block %s", dap_chain_hash_fast_to_str_static(&l_block_hash));
- dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_ACCEPT, "Adding of forked block: ");
+ dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_FORK, "Adding of forked block: ");
l_block_hash_copy = DAP_DUP(&l_block_hash);
l_first_branch_atoms_list = dap_list_append(l_first_branch_atoms_list, l_block_hash_copy);
@@ -141,10 +141,10 @@ void dap_chain_blocks_test()
// dap_test_msg("Add block to former main branch");
l_block_size = 0;
l_block = dap_chain_block_new((dap_hash_fast_t*)dap_list_last(l_first_branch_atoms_list)->data, &l_block_size);
- // dap_assert_PIF(l_block != NULL, "Creating of forked block:");
+ dap_assert_PIF(l_block != NULL, "Creating of forked block:");
dap_hash_fast(l_block, l_block_size, &l_block_hash);
// dap_test_msg("Created block %s", dap_chain_hash_fast_to_str_static(&l_block_hash));
- dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_ACCEPT, "Adding of forked block: ");
+ dap_assert_PIF(l_chain->callback_atom_add(l_chain, (dap_chain_atom_ptr_t)l_block, l_block_size, &l_block_hash) == ATOM_FORK, "Adding of forked block: ");
l_block_hash_copy = DAP_DUP(&l_block_hash);
l_first_branch_atoms_list = dap_list_append(l_first_branch_atoms_list, l_block_hash_copy);
@@ -156,7 +156,7 @@ void dap_chain_blocks_test()
dap_assert_PIF(dap_hash_fast_compare(l_iter->cur_hash, (dap_hash_fast_t*)l_branch_temp->data), "Check adding block into forked branch: ");
}
- dap_pass_msg("Test of one forked branch ")
+ dap_pass_msg("Fork handling test: ")
l_chain->callback_atom_iter_delete(l_iter);
--
GitLab