From 8bc307024e1331811ccdea34d4eb5eb737b7c891 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Thu, 17 May 2018 01:23:05 +0200 Subject: Fix bug where addData/addUser doesn't get send to listening peers --- src/Database.cpp | 4 ++-- tests/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Database.cpp b/src/Database.cpp index 065f441..68f7b9c 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -461,7 +461,7 @@ namespace odhtdb DataView encryptedDataView((char*)requestData.data + serializer.getBuffer().size(), requestData.size - serializer.getBuffer().size()); databaseStorage.appendStorage(*nodeInfo.getRequestHash(), requestDataHash, DatabaseOperation::ADD_DATA, newActionCounter, userToPerformActionWith.getPublicKey(), timestampCombined, (u8*)stagedAddObject.data, stagedAddObject.size, encryptedDataView); - DhtKey dhtKey(requestDataHash); + DhtKey dhtKey(*nodeInfo.getRequestHash()); Value addDataValue((u8*)stagedAddObject.data, stagedAddObject.size); node.put(dhtKey.getNewDataListenerKey(), move(addDataValue), [](bool ok) { @@ -495,7 +495,7 @@ namespace odhtdb DataView additionalDataView((void*)(static_cast(requestData.data) + additionalDataOffset), requestData.size - additionalDataOffset); databaseStorage.appendStorage(*nodeInfo.getRequestHash(), requestDataHash, DatabaseOperation::ADD_USER, newActionCounter, userToPerformActionWith.getPublicKey(), timestampCombined, (u8*)stagedAddObject.data, stagedAddObject.size, additionalDataView); - DhtKey dhtKey(requestDataHash); + DhtKey dhtKey(*nodeInfo.getRequestHash()); Value addDataValue((u8*)stagedAddObject.data, stagedAddObject.size); node.put(dhtKey.getNewDataListenerKey(), move(addDataValue), [](bool ok) { diff --git a/tests/main.cpp b/tests/main.cpp index e4438e7..5d527fe 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -193,7 +193,7 @@ int main() database.addUser(databaseNode, *adminUserKey, localUserKeyPair.getPublicKey(), databaseCreateResponse->getNodeAdminGroupId()->getView()); database.addData(databaseNode, localUserKeyPair, DataView{ (void*)"hello, aaald!", 13 }); - database.seed(databaseNode, DatabaseFetchOrder::NEWEST_FIRST); + database.seed(databaseNode, DatabaseFetchOrder::OLDEST_FIRST); this_thread::sleep_for(chrono::seconds(3)); assertEquals(1, createNodeCounter); @@ -263,7 +263,7 @@ int main() Database database("bootstrap.ring.cx", 4222, storagePath, callbackFuncs); database.loadNode(*databaseNode.getRequestHash()); - database.seed(databaseNode, DatabaseFetchOrder::NEWEST_FIRST); + database.seed(databaseNode, DatabaseFetchOrder::OLDEST_FIRST); this_thread::sleep_for(chrono::seconds(3)); assertEquals(1, createNodeCounter); -- cgit v1.2.3