...

diff --git a/inc/feed.h b/inc/feed.h
index f62e8b5994c3462a537bcebced8e0aad64b8d3ba..261ed722c24310d2809e6ce0a1d811a5374ad78f 100644 (file)
--- a/inc/feed.h
+++ b/inc/feed.h
@@ -6,10 +6,11 @@
 #include<torrent.h>
 
 #define FEED_DIRECTORY PREFIX "/feeds"
+#define FEED_FILE_EXTENSION ".xml"
 
 int feeds();
 int feed_entries(FILE*,struct torrent*);
-int feed_info(struct torrent*,struct rss_channel_info*);
+int feed_info(FILE*,struct torrent*);
 char *feed_path(const char*);
 
 #endif

diff --git a/inc/rss.h b/inc/rss.h
index f2e27d14396bba76da304956eb63c67720c72336..6781dfb0ba5403cd6f371f55dc42f281a716741a 100644 (file)
--- a/inc/rss.h
+++ b/inc/rss.h
@@ -59,11 +59,11 @@ struct rss_entry {
 
 void rss_channel_info_free(struct rss_channel_info*);
 int rss_channel_info_init(struct rss_channel_info**);
-int rss_entry(FILE*,struct rss_entry*);
+int rss_entry(FILE*,const struct rss_entry*);
 void rss_entry_free(struct rss_entry*);
 int rss_entry_init(struct rss_entry**);
 int rss_footer(FILE*);
 int rss_header(FILE*);
-int rss_info(FILE*,struct rss_channel_info*);
+int rss_info(FILE*,const struct rss_channel_info*);
 
 #endif

diff --git a/src/feed/entries.c b/src/feed/entries.c
index 5f26f16c9830180177c5dd695c2edc03ff5edb03..71b91bdc801d700ebcda604da4eb570cb2d4d686 100644 (file)
--- a/src/feed/entries.c
+++ b/src/feed/entries.c
@@ -7,6 +7,9 @@ int feed_entries(FILE *fp, struct torrent *torrent) {
        struct rss_entry **entries, *entry;
        size_t count, index;
 
+       if(NULL==fp) { return -1; }
+       if(NULL==torrent) { return -1; }
+
        count = 0;
        for(size_t i=0;i<torrent->files.roots->size;i++) {
                if(torrent->files.roots->map[i]!=NULL) { count++; }
@@ -35,6 +38,16 @@ int feed_entries(FILE *fp, struct torrent *torrent) {
        
        qsort(entries,count,sizeof(struct rss_entry*),&entries_sort);
 
+       for(size_t i=0;i<count;i++) {
+               entry = entries[i];
+               if(NULL==entry) { goto clean; }
+               if(rss_entry(fp,entry)<0) { goto clean; }
+               rss_entry_free(entry);
+               entries[i] = NULL;
+       }
+
+       free(entries);
+
        return 1;
 clean:
        for(size_t i=0;i<count;i++) {

diff --git a/src/feed/gen.c b/src/feed/gen.c
index 8d4ac456968665b2782a0b8df2e74c345d5147c2..a67aab878750bcb164079a23f00ad1f915509825 100644 (file)
--- a/src/feed/gen.c
+++ b/src/feed/gen.c
@@ -12,7 +12,6 @@ int feeds() {
 
 static int feed_generate(struct torrent *torrent) {
        FILE *fp;
-       struct rss_channel_info info;
        char *path;
 
        if(is_directory(FEED_DIRECTORY)<0) {
@@ -31,9 +30,8 @@ static int feed_generate(struct torrent *torrent) {
        if(torrent_file(torrent)<0) { goto clean; }
 
        if(rss_header(fp)<0) { goto clean; }
-       if(feed_info(torrent,&info)<0) { goto clean; }
-       if(rss_info(fp,&info)<0) { return -1; }
-
+       
+       if(feed_info(fp,torrent)<0) { goto clean; }
        if(feed_entries(fp,torrent)<0) { goto clean; }
 
        if(rss_footer(fp)<0) { goto clean; }

diff --git a/src/feed/info.c b/src/feed/info.c
index 5b15ef094aa2d344736694cda4c35d7c7eda3f28..22b49401aa8b9e558a40aa7df17b3dd1d1a297c9 100644 (file)
--- a/src/feed/info.c
+++ b/src/feed/info.c
@@ -1,5 +1,22 @@
 #include<feed.h>
 
-int feed_info(struct torrent *torrent_p, struct rss_channel_info *info) {
+int feed_info(FILE *fp, struct torrent *torrent_p) {
+       struct rss_channel_info *info;
+
+       if(NULL==fp) { return -1; }
+       if(NULL==torrent_p) { return -1; }
+
+       info = NULL;
+       if(rss_channel_info_init(&info)<0) { return -1; }
+
+       if(meta_info(torrent_p->root,info)<0) { goto clean; }
+       
+       if(rss_info(fp,info)<0) { goto clean; }
+
+       rss_channel_info_free(info);
+
+       return 1;
+clean:
+       if(info!=NULL) { rss_channel_info_free(info); }
        return -1;
 }

diff --git a/src/feed/path.c b/src/feed/path.c
index 09fcec901a6d459ec07bbf2c17e808235e005849..f9b6ac2497dff516398deb43c8f95d5876a5f212 100644 (file)
--- a/src/feed/path.c
+++ b/src/feed/path.c
@@ -1,5 +1,24 @@
 #include<feed.h>
 
 char *feed_path(const char *name) {
-       return NULL;
+       char *p, *path;
+
+       p = concat(FEED_DIRECTORY,name);
+       if(NULL==p) { return NULL; }
+
+       path = malloc(strlen(p)+strlen(FEED_FILE_EXTENSION)+1);
+       if(NULL==path) {
+               free(p);
+               return NULL;
+       }
+
+       if(sprintf(path,"%s" FEED_FILE_EXTENSION,p)<0) {
+               free(p);
+               free(path);
+               return NULL;
+       }
+
+       free(p);
+
+       return path;
 }

diff --git a/src/rss/entry.c b/src/rss/entry.c
index 2d3ecf2aa547b9f967b9adc70ea68be643ccdead..2214d4529c3f6b92fc45ff3f709a24a7d1d573f6 100644 (file)
--- a/src/rss/entry.c
+++ b/src/rss/entry.c
@@ -8,7 +8,7 @@ static int rss_entry_pubdate(FILE*,const struct tm*);
 static int rss_entry_start(FILE*);
 static int rss_entry_title(FILE*,const char*);
 
-int rss_entry(FILE *fp, struct rss_entry *entry) {
+int rss_entry(FILE *fp, const struct rss_entry *entry) {
        if(NULL==fp) { return -1; }
        if(NULL==entry) { return -1; }
 

diff --git a/src/rss/info.c b/src/rss/info.c
index 84f62c9862f3dc56d33eb48b023fbfb76bef4816..3dc84748e71b505bfc694aea8644dacd46acc8b2 100644 (file)
--- a/src/rss/info.c
+++ b/src/rss/info.c
@@ -6,7 +6,7 @@ static int rss_info_last_build_date(FILE*,const struct tm*);
 static int rss_info_link(FILE*,const char*);
 static int rss_info_title(FILE*,const char*);
 
-int rss_info(FILE *fp, struct rss_channel_info *info) {
+int rss_info(FILE *fp, const struct rss_channel_info *info) {
        if(NULL==fp) { return -1; }
        if(NULL==info) { return -1; }
 

diff --git a/src/torrent/path.c b/src/torrent/path.c
index 628f98d02c7f43f85f7ce92937eb2cb206fc1903..2a73b3c4f7e3e2120b7412d9f4e577a5cdf782ce 100644 (file)
--- a/src/torrent/path.c
+++ b/src/torrent/path.c
@@ -12,7 +12,7 @@ char *torrent_file_path(unsigned char *infohash, size_t len) {
        p = concat(TORRENT_FILE_DIRECTORY,hex);
        if(NULL==p) { return NULL; }
 
-       path = malloc(strlen(p)+strlen(".torrent")+1);
+       path = malloc(strlen(p)+strlen(TORRENT_FILE_EXTENSION)+1);
        if(NULL==path) {
                free(p);
                return NULL;

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index 0f27ab3a2c3c6c2a52ace726558a01a02583c17a..88e0b6ac382837f181138f44d60692f8b6c45589 100644 (file)
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS = \
        -Werror
 
 EXTRA_DIST = \
-       test_utils.h
+       test_utils.h \
+       test_macros.h
 
 if ENABLE_DEBUG
 else
@@ -12,7 +13,7 @@ AM_CPPFLAGS += \
        -DNDEBUG
 endif
 
-check_PROGRAMS = bencode.tests block.tests file.tests fs.concat.tests fs.filter.tests hash.tests hashmap.tests meta.tests rss.tests torrent.tests tree.tests
+check_PROGRAMS = bencode.tests block.tests feed.tests file.tests fs.concat.tests fs.filter.tests hash.tests hashmap.tests meta.tests rss.tests torrent.tests tree.tests
 TESTS = $(check_PROGRAMS)
 
 if ENABLE_MEMCHECK
@@ -21,8 +22,17 @@ AM_LOG_FLAGS = --leak-check=full -v --track-origins=yes --error-exitcode=1
 endif
 
 common_SOURCES = \
-       test_utils.c \
-       $(top_srcdir)/src/hash.c
+       test_utils.c
+
+torrent_SOURCES = \
+       $(top_srcdir)/src/bencode/encode.c \
+       $(top_srcdir)/src/block.c \
+       $(top_srcdir)/src/file.c \
+       $(top_srcdir)/src/hashmap.c \
+       $(top_srcdir)/src/torrent/add.c \
+       $(top_srcdir)/src/torrent/free.c \
+       $(top_srcdir)/src/torrent/init.c \
+       $(top_srcdir)/src/tree.c
 
 bencode_tests_SOURCES = \
        $(common_SOURCES) \
@@ -33,14 +43,31 @@ bencode_tests_SOURCES = \
 block_tests_SOURCES = \
        $(common_SOURCES) \
        block.tests.c \
-       $(top_srcdir)/src/block.c
+       $(top_srcdir)/src/block.c \
+       $(top_srcdir)/src/hash.c
+
+feed_tests_SOURCES = \
+       $(common_SOURCES) \
+       $(torrent_SOURCES) \
+       feed.tests.c \
+       $(top_srcdir)/src/feed/entries.c \
+       $(top_srcdir)/src/feed/info.c \
+       $(top_srcdir)/src/fs/concat.c \
+       $(top_srcdir)/src/fs/dir.c \
+       $(top_srcdir)/src/hash.c \
+       $(top_srcdir)/src/meta.c \
+       $(top_srcdir)/src/rss/entry.c \
+       $(top_srcdir)/src/rss/free.c \
+       $(top_srcdir)/src/rss/info.c \
+       $(top_srcdir)/src/rss/init.c
 
 file_tests_SOURCES = \
        $(common_SOURCES) \
        file.tests.c \
        $(top_srcdir)/src/bencode/encode.c \
        $(top_srcdir)/src/block.c \
-       $(top_srcdir)/src/file.c
+       $(top_srcdir)/src/file.c \
+       $(top_srcdir)/src/hash.c
 
 fs_concat_tests_SOURCES = \
        $(common_SOURCES) \
@@ -54,7 +81,8 @@ fs_filter_tests_SOURCES = \
 
 hash_tests_SOURCES = \
        $(common_SOURCES) \
-       hash.tests.c
+       hash.tests.c \
+       $(top_srcdir)/src/hash.c
 
 hashmap_tests_SOURCES = \
        $(common_SOURCES) \
@@ -75,6 +103,7 @@ meta_tests_CPPFLAGS = $(AM_CPPFLAGS) \
 rss_tests_SOURCES = \
        $(common_SOURCES) \
        rss.tests.c \
+       $(top_srcdir)/src/hash.c \
        $(top_srcdir)/src/rss/entry.c \
        $(top_srcdir)/src/rss/footer.c \
        $(top_srcdir)/src/rss/free.c \
@@ -84,21 +113,15 @@ rss_tests_SOURCES = \
 
 torrent_tests_SOURCES = \
        $(common_SOURCES) \
+       $(torrent_SOURCES) \
        torrent.tests.c \
-       $(top_srcdir)/src/bencode/encode.c \
-       $(top_srcdir)/src/block.c \
-       $(top_srcdir)/src/file.c \
        $(top_srcdir)/src/fs/concat.c \
        $(top_srcdir)/src/fs/dir.c \
-       $(top_srcdir)/src/hashmap.c \
-       $(top_srcdir)/src/torrent/add.c \
+       $(top_srcdir)/src/hash.c \
        $(top_srcdir)/src/torrent/file.c \
-       $(top_srcdir)/src/torrent/free.c \
-       $(top_srcdir)/src/torrent/init.c \
        $(top_srcdir)/src/torrent/magnet.c \
        $(top_srcdir)/src/torrent/path.c \
-       $(top_srcdir)/src/torrent/piece.c \
-       $(top_srcdir)/src/tree.c
+       $(top_srcdir)/src/torrent/piece.c
 
 torrent_tests_CPPFLAGS = $(AM_CPPFLAGS) \
        -DTORRENT_INFO_SRC_FILE="$(top_srcdir)/src/torrent/info.c"
@@ -109,4 +132,5 @@ tree_tests_SOURCES = \
        $(top_srcdir)/src/bencode/encode.c \
        $(top_srcdir)/src/block.c \
        $(top_srcdir)/src/file.c \
+       $(top_srcdir)/src/hash.c \
        $(top_srcdir)/src/tree.c

diff --git a/test/unit/feed.tests.c b/test/unit/feed.tests.c
new file mode 100644 (file)
index 0000000..31f5bef
--- /dev/null
+++ b/test/unit/feed.tests.c
@@ -0,0 +1,78 @@
+#include<test_utils.h>
+
+#include<feed.h>
+
+int main();
+static void feed_info_basic_test();
+static void feed_entries_basic_test();
+static FILE *setup_file_pointer();
+
+int main() {
+       setup_env();
+
+       feed_info_basic_test();
+       feed_entries_basic_test();
+
+       clean_env();
+
+       return EXIT_SUCCESS;
+}
+
+static void feed_entries_basic_test() {
+       FILE *fp;
+       struct torrent *p;
+       unsigned char hash[crypto_hash_sha256_BYTES];
+       unsigned char expected[crypto_hash_sha256_BYTES] = {185,160,108,238,240,237,217,219,97,190,118,39,179,198,241,61,191,24,149,75,124,56,189,148,163,13,185,110,30,115,222,186};
+
+       fp = setup_file_pointer();
+
+       TORRENT_SETUP_EXAMPLE(&p);
+
+       assert(-1==feed_entries(NULL,NULL));
+       assert(-1==feed_entries(fp,NULL));
+
+       assert(1==feed_entries(fp,p));
+
+       torrent_free(p);
+
+       fclose(fp);
+       
+       HASH_FILE(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
+       assert(memcmp(hash,expected,crypto_hash_sha256_BYTES)==0);
+
+       reset_env();
+}
+
+static void feed_info_basic_test() {
+       FILE *fp;
+       struct torrent *p;
+       unsigned char hash[crypto_hash_sha256_BYTES];
+       unsigned char expected[crypto_hash_sha256_BYTES] = {185,160,108,238,240,237,217,219,97,190,118,39,179,198,241,61,191,24,149,75,124,56,189,148,163,13,185,110,30,115,222,186};
+       
+       fp = setup_file_pointer();
+
+       assert(feed_info(NULL,NULL)==-1);
+       assert(feed_info(fp,NULL)==-1);
+
+       assert(1==torrent_init(&p,TEST_DIRECTORY,TEST_DIRECTORY,16384));
+
+       assert(1==feed_info(fp,p));
+
+       torrent_free(p);
+
+       fclose(fp);
+
+       HASH_FILE(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
+       assert(memcmp(hash,expected,crypto_hash_sha256_BYTES)==0);
+
+       reset_env();
+}
+
+static FILE *setup_file_pointer() {
+       FILE *fp;
+
+       fp = fopen(TEST_FILE_7,"w");
+       assert(fp!=NULL);
+
+       return fp;
+}

diff --git a/test/unit/meta.tests.c b/test/unit/meta.tests.c
index b64a62229996224e47e177abda407502e38c9c74..495d06cc4ec923dca0e391f094022b82bd06383f 100644 (file)
--- a/test/unit/meta.tests.c
+++ b/test/unit/meta.tests.c
@@ -1,5 +1,7 @@
 #include<test_utils.h>
 
+#include<meta.h>
+
 char *strptime(const char *s, const char *format, struct tm *tm) {
        return (char*)s;
 }

diff --git a/test/unit/rss.tests.c b/test/unit/rss.tests.c
index 1c0822aa7185ffdd250d7c638248f814b41bedb7..059fe453f0c73fabb80873d50f604d756191ccf8 100644 (file)
--- a/test/unit/rss.tests.c
+++ b/test/unit/rss.tests.c
@@ -128,7 +128,7 @@ static void rss_entry_correctness_test() {
 
        fclose(fp);
 
-       hash_file(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
+       HASH_FILE(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
        assert(memcmp(hash,expected,crypto_hash_sha256_BYTES)==0);
 
        rss_entry_free(p);
@@ -168,7 +168,7 @@ static void rss_footer_correctness_test() {
 
        fclose(fp);
 
-       hash_file(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
+       HASH_FILE(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
        assert(memcmp(hash,expected,crypto_hash_sha256_BYTES)==0);
 
        reset_env();
@@ -197,7 +197,7 @@ static void rss_header_correctness_test() {
 
        fclose(fp);
        
-       hash_file(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
+       HASH_FILE(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
        assert(memcmp(hash,expected,crypto_hash_sha256_BYTES)==0);
 
        reset_env();
@@ -289,7 +289,7 @@ static void rss_info_correctness_test() {
 
        fclose(fp);
 
-       hash_file(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
+       HASH_FILE(TEST_FILE_7,hash,crypto_hash_sha256_BYTES);
        assert(memcmp(hash,expected,crypto_hash_sha256_BYTES)==0);
        
        rss_channel_info_free(p);

diff --git a/test/unit/test_macros.h b/test/unit/test_macros.h
new file mode 100644 (file)
index 0000000..9c9233f
--- /dev/null
+++ b/test/unit/test_macros.h
@@ -0,0 +1,72 @@
+#ifndef __TEST_MACROS_H_
+#define __TEST_MACROS_H_
+
+/* Parameters:
+ * const char *path
+ * unsigned char *hash
+ * size_t hash_len
+ */
+#define HASH_FILE(path,hash,hash_len) { \
+       uint8_t buf[16384]; \
+       crypto_hash_sha256_state st; \
+       FILE *fp; \
+       size_t i; \
+\
+       assert(hash_len==crypto_hash_sha256_BYTES); \
+\
+       fp = fopen(path,"r"); \
+       assert(fp!=NULL); \
+\
+       assert(1==hash_init(&st)); \
+\
+       while(feof(fp)==0) { \
+               i = fread(buf,sizeof(uint8_t),16384,fp); \
+               if(i>0) { \
+                       assert(1==hash_update(&st,buf,i)); \
+               } \
+       } \
+\
+       assert(0==fclose(fp)); \
+\
+       assert(hash_final(&st,hash,crypto_hash_sha256_BYTES)==1);\
+}
+
+/* Parameters:
+ * struct file *file_p
+ * const char *filename
+ * int root_val
+ */
+#define TORRENT_SETUP_EXAMPLE_FILE(file_p,filename,root_val) { \
+       struct block *block, *p; \
+\
+       assert(file_init(file_p,filename)==1); \
+       memset((*file_p)->root,root_val,crypto_hash_sha256_BYTES); \
+       for(size_t i=0;i<10;i++) { \
+               assert(block_init(&block)==1); \
+               memset(block->hash,i,crypto_hash_sha256_BYTES); \
+\
+               if((*file_p)->piece_layers==NULL) { \
+                       (*file_p)->piece_layers = block; \
+               } else { \
+                       p->next = block; \
+               } \
+               p = block; \
+       } \
+}
+
+/* Parameters:
+ * struct torrent **p
+ */
+#define TORRENT_SETUP_EXAMPLE(p) { \
+       struct file *file1, *file2; \
+\
+       TORRENT_SETUP_EXAMPLE_FILE(&file1,TEST_FILE_1,1); \
+       TORRENT_SETUP_EXAMPLE_FILE(&file2,TEST_FILE_2,2); \
+\
+       assert(torrent_init(p,TEST_DIRECTORY,TEST_DIRECTORY,16384)==1); \
+\
+       assert(torrent_add(*p,file1)==1); \
+       assert(torrent_add(*p,file2)==1); \
+}
+
+#endif

diff --git a/test/unit/test_utils.c b/test/unit/test_utils.c
index d91a323ac19bc4a18231973f42e82dbee1b7c69f..05482ba76e7607e8f52cfdcbff61c59f32eeef20 100644 (file)
--- a/test/unit/test_utils.c
+++ b/test/unit/test_utils.c
@@ -40,28 +40,3 @@ static void create_test_file(const char *filename, const char *contents) {
        assert(strlen(contents)==fwrite(contents,sizeof(char),strlen(contents),fp));
        assert(fclose(fp)==0);
 }
-
-void hash_file(const char *filepath, unsigned char *hash, size_t hash_len) {
-       uint8_t buf[16384];
-       crypto_hash_sha256_state st;
-       FILE *fp;
-       size_t i;
-
-       assert(hash_len==crypto_hash_sha256_BYTES);
-
-       fp = fopen(filepath,"r");
-       assert(fp!=NULL);
-
-       assert(1==hash_init(&st));
-
-       while(feof(fp)==0) {
-               i = fread(buf,sizeof(uint8_t),16384,fp);
-               if(i>0) {
-                       assert(1==hash_update(&st,buf,i));
-               }
-       }
-
-       assert(0==fclose(fp));
-
-       assert(hash_final(&st,hash,crypto_hash_sha256_BYTES)==1);
-}

diff --git a/test/unit/test_utils.h b/test/unit/test_utils.h
index e09bc0f4e2d3a2a9a8c25f440e506a8452c1b8b6..2c62102fa25343475bee8477886fd0198d754f3f 100644 (file)
--- a/test/unit/test_utils.h
+++ b/test/unit/test_utils.h
@@ -1,6 +1,8 @@
 #ifndef __TEST_UTILS_H_
 #define __TEST_UTILS_H_
 
+#include<test_macros.h>
+
 #include<assert.h>
 #include<stdlib.h>
 #include<string.h>
@@ -35,6 +37,5 @@
 void clean_env();
 void reset_env();
 void setup_env();
-void hash_file(const char*,unsigned char*,size_t);
 
 #endif

diff --git a/test/unit/torrent.tests.c b/test/unit/torrent.tests.c
index da7942557ee0ecad45d1a53f157bdc98d1c03d89..4ae8528cb4668f78c170213e7a2c62b91a47c0b5 100644 (file)
--- a/test/unit/torrent.tests.c
+++ b/test/unit/torrent.tests.c
@@ -11,8 +11,6 @@ static void torrent_file_path_basic_test();
 static void torrent_file_piece_layers_basic_test();
 static void torrent_init_basic_test();
 static void torrent_magnet_basic_test();
-static void torrent_setup_example(struct torrent**);
-static void torrent_setup_example_file(struct file**,const char*,uint8_t);
 
 int main() {
        setup_env();
@@ -84,7 +82,7 @@ static void torrent_add_basic_test() {
 static void torrent_file_basic_test() {
        struct torrent *torrent;
        
-       torrent_setup_example(&torrent);
+       TORRENT_SETUP_EXAMPLE(&torrent);
 
        assert(1==torrent_file(torrent));
 
@@ -95,7 +93,7 @@ static void torrent_file_info_basic_test() {
        struct torrent *torrent;
        uint8_t *buf;
 
-       torrent_setup_example(&torrent);
+       TORRENT_SETUP_EXAMPLE(&torrent);
 
        assert(-1==torrent_file_info(NULL,NULL));
        assert(-1==torrent_file_info(torrent,NULL));
@@ -156,7 +154,7 @@ static void torrent_file_info_conformance_test() {
        assert(i==32);
 
        sprintf(path,"%s/torrents/%s.torrent",TEST_DIRECTORY,infohash_expected);
-       hash_file(path,out,crypto_hash_sha256_BYTES);
+       HASH_FILE(path,out,crypto_hash_sha256_BYTES);
 
        assert(memcmp(out,expected,crypto_hash_sha256_BYTES)==0);
 
@@ -193,12 +191,12 @@ static void torrent_file_piece_layers_basic_test() {
        fp = fopen(TEST_FILE_6,"w");
        assert(fp!=NULL);
 
-       torrent_setup_example(&torrent);
+       TORRENT_SETUP_EXAMPLE(&torrent);
        assert(torrent_file_piece_layers(fp,torrent)==1);
 
        assert(0==fclose(fp));
 
-       hash_file(TEST_FILE_6,hash,crypto_hash_sha256_BYTES);
+       HASH_FILE(TEST_FILE_6,hash,crypto_hash_sha256_BYTES);
 
        assert(memcmp(hash,expected,crypto_hash_sha256_BYTES)==0);
 
@@ -224,7 +222,7 @@ static void torrent_magnet_basic_test() {
        char *p;
        char expected[] = "magnet:?xt=urn:btmh:59b2020fe4275cac5c3b8ac32bdc79010c95cf0bac2fd91ced8dd071f8ef91ca&dn=" TEST_DIRECTORY;
 
-       torrent_setup_example(&torrent);
+       TORRENT_SETUP_EXAMPLE(&torrent);
        
        p = torrent_magnet(torrent);
        assert(p!=NULL);
@@ -236,34 +234,3 @@ static void torrent_magnet_basic_test() {
 
        reset_env();
 }
-
-static void torrent_setup_example_file(struct file **file_p, const char *filename, uint8_t root_val) {
-       struct block *block, *p;
-
-       assert(file_init(file_p,filename)==1);
-       memset((*file_p)->root,root_val,crypto_hash_sha256_BYTES);
-       for(size_t i=0;i<10;i++) {
-               assert(block_init(&block)==1);
-               memset(block->hash,i,crypto_hash_sha256_BYTES);
-
-               if((*file_p)->piece_layers==NULL) {
-                       (*file_p)->piece_layers = block;
-               } else {
-                       p->next = block;
-               }
-               
-               p = block;
-       }
-}
-
-static void torrent_setup_example(struct torrent **p) {
-       struct file *file1, *file2;
-
-       torrent_setup_example_file(&file1,TEST_FILE_1,1);
-       torrent_setup_example_file(&file2,TEST_FILE_2,2);
-
-       assert(torrent_init(p,TEST_DIRECTORY,TEST_DIRECTORY,16384)==1);
-       
-       assert(torrent_add(*p,file1)==1);
-       assert(torrent_add(*p,file2)==1);
-}