Refactor to CMocka

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13)
 # set the project name
 project(OlinCoin C CXX)
 enable_testing()
-#set(CMAKE_BUILD_TYPE Debug)
+set(CMAKE_BUILD_TYPE Debug)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

src/core/blocks/base_block.c

@@ -14,6 +14,20 @@ void hash_blockheader(unsigned char *dest, BlockHeader *header) {
   free(header_buf);
 }
 
+void free_block(Block *block) {
+  if (block == NULL)
+    return;
+
+  if (block->txs != NULL) {
+    for (unsigned int i = 0; i < block->num_txs; i++)
+      if (block->txs[i] != NULL)
+        free_tx(block->txs[i]);
+    free(block->txs);
+  }
+
+  free(block);
+}
+
 void print_block_header(BlockHeader *header, char *prefix){
   char *sub_prefix = malloc(strlen(prefix)+strlen(PRINT_TAB)+1);
   strcpy(sub_prefix, prefix);

src/core/blocks/ser_block.c

@@ -15,13 +15,6 @@
     return data; \
   }
 
-size_t size_ser_blockheader() {
-  return sizeof(((BlockHeader*)0)->timestamp) +
-    sizeof(((BlockHeader*)0)->all_tx) +
-    sizeof(((BlockHeader*)0)->prev_header_hash) +
-    sizeof(((BlockHeader*)0)->nonce);
-}
-
 ssize_t ser_blockheader(unsigned char *dest, BlockHeader *blockheader) {
   memcpy(dest, &(blockheader->timestamp), sizeof(blockheader->timestamp));
 
@@ -42,7 +35,7 @@ ssize_t ser_blockheader(unsigned char *dest, BlockHeader *blockheader) {
 unsigned char *ser_blockheader_alloc(ssize_t *written, BlockHeader *blockheader) {
   unsigned char *data;
   ssize_t ret;
-  data = malloc(size_ser_blockheader());
+  data = malloc(BLOCKHEADER_SER_LEN);
   ret = ser_blockheader(data, blockheader);
   RETURN_SER(data, ret, written)
 }
@@ -75,7 +68,7 @@ BlockHeader *deser_blockheader_alloc(ssize_t *read, unsigned char *src) {
 }
 
 size_t size_ser_block(Block *block){
-  size_t size = sizeof(block->num_txs) + size_ser_blockheader();
+  size_t size = sizeof(block->num_txs) + BLOCKHEADER_SER_LEN;
   for(unsigned int i = 0; i < block->num_txs; i++)
       size += size_ser_tx(block->txs[i]);
   return size;

src/core/globals/CMakeLists.txt

@@ -30,6 +30,7 @@ add_library(double_spend STATIC double_spend_set.c)
 target_include_directories(double_spend PUBLIC ${INCLUDE_ALL})
 target_link_libraries(double_spend
   utxopool)
+
 add_library(init_globals STATIC init_globals.c)
 target_include_directories(init_globals PUBLIC ${INCLUDE_ALL})
 target_link_libraries(init_globals

src/core/globals/blockchain.c

@@ -53,7 +53,7 @@ int read_chain(){
   free(path);
   if(!fp_chain){
     return i;
-  }  
+  }
   int ret_scanf = fscanf(fp_chain, "%d", &i);
   fclose(fp_chain);
   if(ret_scanf != 1){
@@ -114,7 +114,7 @@ int blockchain_init_leveldb(char *db_env){
   // Check if we are using an existing DB
   if(found_genesis == 0){
     free(test_genesis_block);
-     
+
     if(read_hash == 0 && file_chain_height != -1){
       Block *test_top_block;
       int found_top = blockchain_find_leveldb(&test_top_block, file_top_block_hash);
@@ -132,14 +132,13 @@ int blockchain_init_leveldb(char *db_env){
       }
     }
   }
-  
+
 
   if(use_existing_db){
     chain_height = file_chain_height;
     memcpy(top_block_header_hash, file_top_block_hash, BLOCK_HASH_LEN);
   }
   else{
-
     int ret = blockchain_add_leveldb(&genesis_block);
     if(ret != 0){
       return 3;
@@ -254,7 +253,7 @@ void print_blockchain_hashmap(char *prefix){
 
       printf("%shashmap_id:\n", prefix);
       dump_buf(sub_prefix, "block_hash:", key_ptr, BLOCK_HASH_LEN);
-      
+
 
       Block *read_block = deser_block_alloc(NULL, (unsigned char*)value_ptr);
       print_block(read_block, prefix);
@@ -263,7 +262,7 @@ void print_blockchain_hashmap(char *prefix){
   }
   leveldb_iter_destroy(iter);
   leveldb_readoptions_destroy(roptions);
-  leveldb_free(err); 
+  leveldb_free(err);
   free(sub_prefix);
 }
 
@@ -285,7 +284,7 @@ void pretty_print_blockchain_hashmap(){
       unsigned const char *value_ptr = (unsigned const char*) leveldb_iter_value(iter, &value_len);
 
       dump_buf("", "Block_Hash:", key_ptr, BLOCK_HASH_LEN);
-      
+
 
       Block *read_block = deser_block_alloc(NULL, (unsigned char*)value_ptr);
       pretty_print_block_header(&read_block->header, PRINT_TAB);
@@ -295,5 +294,5 @@ void pretty_print_blockchain_hashmap(){
   }
   leveldb_iter_destroy(iter);
   leveldb_readoptions_destroy(roptions);
-  leveldb_free(err); 
+  leveldb_free(err);
 }

src/core/globals/mempool.c

@@ -12,13 +12,13 @@ Transaction *mempool_add(Transaction *tx) {
 
   new_entry = malloc(sizeof(MemPool));
   hash_tx(new_entry->id, tx);
-  new_entry->tx = tx;
+  new_entry->tx = copy_tx(tx);
 
   found_entry = mempool_find_node(new_entry->id);
   if (found_entry == NULL) {
     HASH_ADD(hh, mempool, id, TX_HASH_LEN, new_entry);
     utxo_to_tx_add_tx(tx);
-    return tx;
+    return new_entry->tx;
   }
   free(new_entry);
   return NULL;
@@ -51,7 +51,7 @@ Transaction *mempool_find(unsigned char *tx_hash) {
 
   found_entry = mempool_find_node(tx_hash);
   if (found_entry != NULL) {
-    return found_entry->tx;
+    return copy_tx(found_entry->tx);
   }
 
   return NULL;

src/core/txs/base_tx.c

@@ -14,6 +14,7 @@ void hash_tx(unsigned char *dest, Transaction *tx) {
   tx_buf = malloc(size_ser_tx(tx));
   ser_tx(tx_buf, tx);
   hash_sha256(dest, tx_buf, tx_buf_size);
+  free(tx_buf);
 }
 
 void free_tx(Transaction *tx){
@@ -40,7 +41,6 @@ Transaction *copy_tx(Transaction *tx){
     return NULL;
 
   // Copy inputs
-  // Harder since we need to also copy pub keys
   copy = malloc(sizeof(Transaction));
   copy->num_inputs = tx->num_inputs;
   copy->inputs = malloc(tx->num_inputs * sizeof(Input));

src/core/txs/ser_tx.c

@@ -65,7 +65,8 @@ ssize_t ser_input(unsigned char *dest, Input *input) {
   memcpy(sig_len, &(input->sig_len), sizeof(input->sig_len));
 
   unsigned char *sig = sig_len + sizeof(input->sig_len);
-  memcpy(sig, input->signature, SIGNATURE_LEN);
+  memset(sig, 0, SIGNATURE_LEN);
+  memcpy(sig, input->signature, input->sig_len);
 
   unsigned char *prev_tx = sig + SIGNATURE_LEN;
   memcpy(prev_tx, input->prev_tx_id, TX_HASH_LEN);

src/core/txs/wallet_pool.c

@@ -117,6 +117,14 @@ int wallet_pool_count(unsigned int *num_entries){
   return db_count(wallet_pool_db, num_entries);
 }
 
+void free_wallet_entry(WalletEntry *entry) {
+  if (entry == NULL)
+    return;
+  if (entry->key_pair != NULL)
+    mbedtls_ecp_keypair_free(entry->key_pair);
+  free(entry);
+}
+
 /* KEY POOL FUNCS */
 int key_pool_add_leveldb(mbedtls_ecp_keypair *key_pair) {
   unsigned char db_key[PUB_KEY_HASH_LEN];
@@ -161,7 +169,7 @@ int key_pool_find_leveldb(mbedtls_ecdsa_context **keypair, unsigned char *public
   if(read == NULL){
     return 1;
   }
-  
+
   size_t read_bytes;
   *keypair = deser_keypair_alloc(&read_bytes, (unsigned char*) read);
   free(read);

src/includes/blocks/base_block.h

@@ -22,6 +22,13 @@ typedef struct Block{
  */
 void hash_blockheader(unsigned char *dest, BlockHeader *header);
 
+/**
+ * @brief Frees a block
+ *
+ * @param block Block to free
+ */
+void free_block(Block *block);
+
 /*
 Prints a Block Header to stdout so data can be visualized
 

src/includes/blocks/ser_block.h

@@ -6,12 +6,13 @@
  * Blockheaders
  ******************************************************************************/
 
-/**
- * @brief Gets size of serialized BlockHeader
- *
- * @return Size of serialized BlockHeader
- */
-size_t size_ser_blockheader();
+#define BLOCKHEADER_SER_LEN \
+  ( \
+    sizeof(((BlockHeader*)0)->timestamp) + \
+    sizeof(((BlockHeader*)0)->all_tx) + \
+    sizeof(((BlockHeader*)0)->prev_header_hash) + \
+    sizeof(((BlockHeader*)0)->nonce) \
+  )
 
 /**
  * @brief Serialize a BlockHeader

src/includes/txs/wallet_pool.h

@@ -91,6 +91,13 @@ int wallet_pool_remove_leveldb(unsigned char *tx_hash, unsigned int vout);
  */
 int wallet_pool_count(unsigned int *num_entries);
 
+/**
+ * @brief Frees a wallet entry
+ *
+ * @param entry Wallet entry to free
+ */
+void free_wallet_entry(WalletEntry *entry);
+
 /**
  * @brief Add a keypair to the keypool
  * 

src/tests/CMakeLists.txt

@@ -1,5 +1,6 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tests/")
 message(STATUS "Test Output set to: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+add_subdirectory(includes)
 add_subdirectory(core)
 
 

src/tests/core/CMakeLists.txt

@@ -3,3 +3,4 @@ add_subdirectory(blocks)
 add_subdirectory(global)
 add_subdirectory(txs)
 add_subdirectory(utils)
+add_subdirectory(fixtures)

src/tests/core/blocks/CMakeLists.txt

@@ -22,9 +22,12 @@ target_link_libraries(test_handle_block
 # Test ser block
 add_executable(test_ser_block test_ser_block.c)
 target_compile_options(test_ser_block PRIVATE ${COMPILE_OPTIONS_STD})
-target_include_directories(test_ser_block PUBLIC ${INCLUDE_ALL})
+target_include_directories(test_ser_block
+    PUBLIC ${INCLUDE_ALL}
+    PUBLIC ${INCLUDE_FIXTURES})
 target_link_libraries(test_ser_block
-  core_mine)
+  core_mine
+  fixtures)
 
 add_test(test_create_block ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_create_block)
 add_test(test_validate_block ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_validate_block)