From e338f8fb44bf1a08d812a7444b5b0f93aa573552 Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Sat, 30 Jul 2022 04:30:28 +0000
Subject: [PATCH] Support 4120 to develop
---
CMakeLists.txt | 13 ++++++-------
cellframe-sdk | 2 +-
test/CMakeLists.txt | 1 -
test/dap_global_db_test.h | 2 +-
test/dap_tx_test.c | 2 +-
test/libdap-test | 1 -
6 files changed, 9 insertions(+), 12 deletions(-)
delete mode 160000 test/libdap-test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f457f671d..088bf1801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,12 @@ elseif(WIN32 OR BSD OR ANDROID)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
endif()
+if(BUILD_CELLFRAME_NODE_TESTS)
+ enable_testing()
+ set(CELLFRAME_MODULES ${CELLFRAME_MODULES} "test-framework")
+ add_subdirectory(test)
+endif()
+
add_subdirectory(cellframe-sdk)
if(UNIX)
@@ -143,13 +149,6 @@ set(NODE_TARGET "${PROJECT_NAME}" )
set(NODE_CLI_TARGET "${PROJECT_NAME}-cli" )
set(NODE_TOOL_TARGET "${PROJECT_NAME}-tool")
-
-
-if(BUILD_CELLFRAME_NODE_TESTS)
- enable_testing()
- add_subdirectory(test)
-endif()
-
set( NODE_SOURCES
sources/main.c
sources/sig_unix_handler.c
diff --git a/cellframe-sdk b/cellframe-sdk
index cf3228038..527844826 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit cf32280389034d0805df5035f151ee61904aeff3
+Subproject commit 527844826f439b6121a6190d073a0c10af17fcdb
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 895d48dd7..ec82c87c4 100755
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,6 @@ if(TARGET kelvin_node_test)
endif()
project(kelvin_node_test)
-add_subdirectory(libdap-test)
file(GLOB SOURCES *.c)
file(GLOB HEADERS *.h)
diff --git a/test/dap_global_db_test.h b/test/dap_global_db_test.h
index 00bae493c..444dadeeb 100644
--- a/test/dap_global_db_test.h
+++ b/test/dap_global_db_test.h
@@ -1,4 +1,4 @@
#pragma once
-#include "libdap-test/dap_test.h"
+#include "dap_test.h"
extern void dap_global_db_tests_run(void);
diff --git a/test/dap_tx_test.c b/test/dap_tx_test.c
index 1a33ea7b5..a7051bcad 100755
--- a/test/dap_tx_test.c
+++ b/test/dap_tx_test.c
@@ -268,7 +268,7 @@ int dap_node_run_action(scenario_t action) {
dap_ledger_t *l_ledger = dap_chain_ledger_by_net_name("local-testnet");
size_t l_addr_tokens_size = 0;
char **l_addr_tokens = NULL;
- dap_chain_ledger_addr_get_token_ticker_all_fast(l_ledger, l_addr_to, &l_addr_tokens, &l_addr_tokens_size);
+ dap_chain_ledger_addr_get_token_ticker_all(l_ledger, l_addr_to, &l_addr_tokens, &l_addr_tokens_size);
dap_assert_PIF(l_addr_tokens_size > 0, "No tokens found on wallet.");
uint256_t l_balance_to = dap_chain_ledger_calc_balance(l_ledger, l_addr_to, l_addr_tokens[0]);
dap_assert_PIF(compare256(l_balance_to, dap_chain_uint256_from(1000000000000000)) == 0, "Balance TO is not equal what it must be.");
diff --git a/test/libdap-test b/test/libdap-test
deleted file mode 160000
index b76175acc..000000000
--- a/test/libdap-test
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b76175acc517f085c319c8e66c62bd143f96bf94
--
GitLab