Major changes to support large file transfer
This commit is contained in:
John Jones
parent
a2a08156a7
commit
03696dd6e7
40 changed files with 875 additions and 427 deletions
|
|
@ -40,29 +40,29 @@ int test_merkledag_get_data() {
|
|||
}
|
||||
|
||||
// create a node
|
||||
struct Node* node1;
|
||||
retVal = ipfs_node_new_from_data(binary_data, binary_data_size, &node1);
|
||||
struct HashtableNode* node1;
|
||||
retVal = ipfs_hashtable_node_new_from_data(binary_data, binary_data_size, &node1);
|
||||
size_t bytes_written = 0;
|
||||
retVal = ipfs_merkledag_add(node1, fs_repo, &bytes_written);
|
||||
if (retVal == 0) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// now retrieve it
|
||||
struct Node* results_node;
|
||||
struct HashtableNode* results_node;
|
||||
retVal = ipfs_merkledag_get(node1->hash, node1->hash_size, &results_node, fs_repo);
|
||||
if (retVal == 0) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(results_node);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(results_node);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (results_node->data_size != 256) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(results_node);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(results_node);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -70,15 +70,15 @@ int test_merkledag_get_data() {
|
|||
// the data should be the same
|
||||
for(int i = 0; i < results_node->data_size; i++) {
|
||||
if (results_node->data[i] != node1->data[i]) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(results_node);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(results_node);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(results_node);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(results_node);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
|
||||
return retVal;
|
||||
|
|
@ -102,13 +102,13 @@ int test_merkledag_add_data() {
|
|||
}
|
||||
|
||||
// create a node
|
||||
struct Node* node1;
|
||||
retVal = ipfs_node_new_from_data(binary_data, binary_data_size, &node1);
|
||||
struct HashtableNode* node1;
|
||||
retVal = ipfs_hashtable_node_new_from_data(binary_data, binary_data_size, &node1);
|
||||
|
||||
size_t bytes_written = 0;
|
||||
retVal = ipfs_merkledag_add(node1, fs_repo, &bytes_written);
|
||||
if (retVal == 0) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -118,31 +118,31 @@ int test_merkledag_add_data() {
|
|||
|
||||
int first_add_size = os_utils_file_size("/tmp/.ipfs/datastore/data.mdb");
|
||||
if (first_add_size == start_file_size) { // uh oh, database should have increased in size
|
||||
ipfs_node_free(node1);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// adding the same binary again should do nothing (the hash should be the same)
|
||||
struct Node* node2;
|
||||
retVal = ipfs_node_new_from_data(binary_data, binary_data_size, &node2);
|
||||
struct HashtableNode* node2;
|
||||
retVal = ipfs_hashtable_node_new_from_data(binary_data, binary_data_size, &node2);
|
||||
retVal = ipfs_merkledag_add(node2, fs_repo, &bytes_written);
|
||||
if (retVal == 0) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// make sure everything is correct
|
||||
if (node2->hash == NULL) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
return 0;
|
||||
}
|
||||
for(int i = 0; i < node1->hash_size; i++) {
|
||||
if (node1->hash[i] != node2->hash[i]) {
|
||||
printf("hash of node1 does not match node2 at position %d\n", i);
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -150,36 +150,36 @@ int test_merkledag_add_data() {
|
|||
int second_add_size = os_utils_file_size("/tmp/.ipfs/datastore/data.mdb");
|
||||
if (first_add_size != second_add_size) { // uh oh, the database shouldn't have changed size
|
||||
printf("looks as if a new record was added when it shouldn't have. Old file size: %d, new file size: %d\n", first_add_size, second_add_size);
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// now change 1 byte, which should change the hash
|
||||
binary_data[10] = 0;
|
||||
// create a node
|
||||
struct Node* node3;
|
||||
retVal = ipfs_node_new_from_data(binary_data, binary_data_size, &node3);
|
||||
struct HashtableNode* node3;
|
||||
retVal = ipfs_hashtable_node_new_from_data(binary_data, binary_data_size, &node3);
|
||||
|
||||
retVal = ipfs_merkledag_add(node3, fs_repo, &bytes_written);
|
||||
if (retVal == 0) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_node_free(node3);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
ipfs_hashtable_node_free(node3);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// make sure everything is correct
|
||||
if (node3->hash == NULL) {
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_node_free(node3);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
ipfs_hashtable_node_free(node3);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_node_free(node3);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
ipfs_hashtable_node_free(node3);
|
||||
int third_add_size = os_utils_file_size("/tmp/.ipfs/datastore/data.mdb");
|
||||
if (third_add_size == second_add_size || third_add_size < second_add_size) {// uh oh, it didn't add it
|
||||
printf("Node 3 should have been added, but the file size did not change from %d.\n", third_add_size);
|
||||
|
|
@ -193,7 +193,7 @@ int test_merkledag_add_data() {
|
|||
|
||||
int test_merkledag_add_node() {
|
||||
int retVal = 0;
|
||||
struct Node* node1 = NULL;
|
||||
struct HashtableNode* node1 = NULL;
|
||||
|
||||
struct FSRepo* fs_repo = createAndOpenRepo("/tmp/.ipfs");
|
||||
if (fs_repo == NULL) {
|
||||
|
|
@ -201,7 +201,7 @@ int test_merkledag_add_node() {
|
|||
return 0;
|
||||
}
|
||||
|
||||
retVal = ipfs_node_new(&node1);
|
||||
retVal = ipfs_hashtable_node_new(&node1);
|
||||
if (retVal == 0) {
|
||||
printf("Unable to make node\n");
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
|
|
@ -212,12 +212,12 @@ int test_merkledag_add_node() {
|
|||
retVal = ipfs_merkledag_add(node1, fs_repo, &bytes_written);
|
||||
if (retVal == 0) {
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
ipfs_node_free(node1);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
printf("Unable to add node\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
ipfs_node_free(node1);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
|
||||
return 1;
|
||||
|
|
@ -229,8 +229,8 @@ int test_merkledag_add_node() {
|
|||
int test_merkledag_add_node_with_links() {
|
||||
int retVal = 0;
|
||||
struct NodeLink* link = NULL;
|
||||
struct Node* node1 = NULL;
|
||||
struct Node* node2 = NULL;
|
||||
struct HashtableNode* node1 = NULL;
|
||||
struct HashtableNode* node2 = NULL;
|
||||
|
||||
struct FSRepo* fs_repo = createAndOpenRepo("/tmp/.ipfs");
|
||||
if (fs_repo == NULL) {
|
||||
|
|
@ -245,7 +245,7 @@ int test_merkledag_add_node_with_links() {
|
|||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
return 0;
|
||||
}
|
||||
retVal = ipfs_node_new_from_link(link, &node1);
|
||||
retVal = ipfs_hashtable_node_new_from_link(link, &node1);
|
||||
if (retVal == 0) {
|
||||
printf("Unable to make node\n");
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
|
|
@ -256,7 +256,7 @@ int test_merkledag_add_node_with_links() {
|
|||
retVal = ipfs_merkledag_add(node1, fs_repo, &bytes_written);
|
||||
if (retVal == 0) {
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
ipfs_node_free(node1);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
printf("Unable to add node\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -265,7 +265,7 @@ int test_merkledag_add_node_with_links() {
|
|||
retVal = ipfs_merkledag_get(node1->hash, node1->hash_size, &node2, fs_repo);
|
||||
if (retVal == 0) {
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
ipfs_node_free(node1);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -275,8 +275,8 @@ int test_merkledag_add_node_with_links() {
|
|||
if (node1_link->hash_size != node2_link->hash_size) {
|
||||
printf("Hashes are not of the same length. Hash1: %lu, Hash2: %lu\n", node1_link->hash_size, node2_link->hash_size);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
return 0;
|
||||
}
|
||||
while(node1_link != NULL) {
|
||||
|
|
@ -284,8 +284,8 @@ int test_merkledag_add_node_with_links() {
|
|||
if(node1_link->hash[i] != node2_link->hash[i]) {
|
||||
printf("Hashes do not match for node %s\n", node1_link->name);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -293,8 +293,8 @@ int test_merkledag_add_node_with_links() {
|
|||
node2_link = node2_link->next;
|
||||
}
|
||||
|
||||
ipfs_node_free(node1);
|
||||
ipfs_node_free(node2);
|
||||
ipfs_hashtable_node_free(node1);
|
||||
ipfs_hashtable_node_free(node2);
|
||||
ipfs_repo_fsrepo_free(fs_repo);
|
||||
|
||||
return 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue