From dae15c284248d49079ad5f8a3d8ff30e217f419e Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Thu, 25 Jul 2019 12:50:46 +0200 Subject: build: Refactor normal to unicast This completes the renaming of the normal IPCP to the unicast IPCP in the sources, to get everything consistent with the documentation. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/ipcpd/normal/tests/CMakeLists.txt | 37 ------------- src/ipcpd/normal/tests/dht_test.c | 99 ----------------------------------- 2 files changed, 136 deletions(-) delete mode 100644 src/ipcpd/normal/tests/CMakeLists.txt delete mode 100644 src/ipcpd/normal/tests/dht_test.c (limited to 'src/ipcpd/normal/tests') diff --git a/src/ipcpd/normal/tests/CMakeLists.txt b/src/ipcpd/normal/tests/CMakeLists.txt deleted file mode 100644 index 482711d5..00000000 --- a/src/ipcpd/normal/tests/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -get_filename_component(CURRENT_SOURCE_PARENT_DIR - ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) -get_filename_component(CURRENT_BINARY_PARENT_DIR - ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -include_directories(${CURRENT_SOURCE_PARENT_DIR}) -include_directories(${CURRENT_BINARY_PARENT_DIR}) - -include_directories(${CMAKE_SOURCE_DIR}/include) -include_directories(${CMAKE_BINARY_DIR}/include) - -get_filename_component(PARENT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) -get_filename_component(PARENT_DIR ${PARENT_PATH} NAME) - -create_test_sourcelist(${PARENT_DIR}_tests test_suite.c - # Add new tests here - dht_test.c - ) - -protobuf_generate_c(KAD_PROTO_SRCS KAD_PROTO_HDRS ../kademlia.proto) - -add_executable(${PARENT_DIR}_test EXCLUDE_FROM_ALL ${${PARENT_DIR}_tests} - ${KAD_PROTO_SRCS}) -target_link_libraries(${PARENT_DIR}_test ouroboros-common) - -add_dependencies(check ${PARENT_DIR}_test) - -set(tests_to_run ${${PARENT_DIR}_tests}) -remove(tests_to_run test_suite.c) - -foreach (test ${tests_to_run}) - get_filename_component(test_name ${test} NAME_WE) - add_test(${test_name} ${C_TEST_PATH}/${PARENT_DIR}_test ${test_name}) -endforeach (test) diff --git a/src/ipcpd/normal/tests/dht_test.c b/src/ipcpd/normal/tests/dht_test.c deleted file mode 100644 index 26e9102e..00000000 --- a/src/ipcpd/normal/tests/dht_test.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - 2019 - * - * Unit tests of the DHT - * - * Dimitri Staessens - * Sander Vrijders - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., http://www.fsf.org/about/contact/. - */ - -#define __DHT_TEST__ - -#include "dht.c" - -#include -#include -#include -#include - -#define KEY_LEN 32 - -#define EXP 86400 -#define CONTACTS 1000 - -int dht_test(int argc, - char ** argv) -{ - struct dht * dht; - uint64_t addr = 0x0D1F; - uint8_t key[KEY_LEN]; - size_t i; - - (void) argc; - (void) argv; - - dht = dht_create(addr); - if (dht == NULL) { - printf("Failed to create dht.\n"); - return -1; - } - - dht_destroy(dht); - - dht = dht_create(addr); - if (dht == NULL) { - printf("Failed to re-create dht.\n"); - return -1; - } - - if (dht_bootstrap(dht, KEY_LEN, EXP)) { - printf("Failed to bootstrap dht.\n"); - dht_destroy(dht); - return -1; - } - - dht_destroy(dht); - - dht = dht_create(addr); - if (dht == NULL) { - printf("Failed to re-create dht.\n"); - return -1; - } - - if (dht_bootstrap(dht, KEY_LEN, EXP)) { - printf("Failed to bootstrap dht.\n"); - dht_destroy(dht); - return -1; - } - - for (i = 0; i < CONTACTS; ++i) { - uint64_t addr; - random_buffer(&addr, sizeof(addr)); - random_buffer(key, KEY_LEN); - pthread_rwlock_wrlock(&dht->lock); - if (dht_update_bucket(dht, key, addr)) { - pthread_rwlock_unlock(&dht->lock); - printf("Failed to update bucket.\n"); - dht_destroy(dht); - return -1; - } - pthread_rwlock_unlock(&dht->lock); - } - - dht_destroy(dht); - - return 0; -} -- cgit v1.2.3