[DHT] Only update put when sequence is greater than previous

AmirAbrams · AmirAbrams · commit 17ff3dc208ad · 2019-07-12T12:45:20.000-05:00
diff --git a/src/dht/limits.cpp b/src/dht/limits.cpp
@@ -70,7 +70,6 @@ bool CheckSalt(const std::string& strSalt, const unsigned int nHeight, std::stri
             iAllowed++;
             continue;
         }
-        LogPrintf("%s -- Salt %s passed all checks. Valid data record salt\n", __func__, strSalt);
         return true;
     }
     strErrorMessage = strprintf("%sInvalid salt (%s). Allow data type salt not found in allowed data map.", strErrorMessage, vSplit[0]);
diff --git a/src/dht/storage.cpp b/src/dht/storage.cpp
@@ -194,17 +194,17 @@ void CDHTStorage::put_mutable_item(sha1_hash const& target
     CMutableData previousData;
     if (!GetLocalMutableData(vchInfoHash, previousData)) {
         if (PutLocalMutableData(vchInfoHash, putMutableData)) {
-            LogPrint("dht", "CDHTStorage -- put_mutable_item added successfully\n");
+            LogPrintf("CDHTStorage::%s added successfully\n", __func__);
         }
     }
     else {
-        if (putMutableData.Value() != previousData.Value() || putMutableData.SequenceNumber != previousData.SequenceNumber) {
+        if (putMutableData.SequenceNumber > previousData.SequenceNumber) {
             if (UpdateLocalMutableData(vchInfoHash, putMutableData)) {
-                LogPrint("dht", "CDHTStorage -- put_mutable_item updated successfully\n");
+                LogPrintf("CDHTStorage::%s updated successfully\n", __func__);
             }
         }
         else {
-            LogPrint("dht", "CDHTStorage -- put_mutable_item value unchanged. No database operation needed.\n");
+            LogPrintf("CDHTStorage::%s value unchanged. No database operation needed.\n", __func__);
         }
     }
     // TODO: Log from address (addr). See touch_item in the default storage implementation.

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ bool CheckSalt(const std::string& strSalt, const unsigned int nHeight, std::stri`
`70`	`70`	`iAllowed++;`
`71`	`71`	`continue;`
`72`	`72`	`}`
`73`		`- LogPrintf("%s -- Salt %s passed all checks. Valid data record salt\n", __func__, strSalt);`
`74`	`73`	`return true;`
`75`	`74`	`}`
`76`	`75`	`strErrorMessage = strprintf("%sInvalid salt (%s). Allow data type salt not found in allowed data map.", strErrorMessage, vSplit[0]);`
Original file line number	Diff line number	Diff line change
`@@ -194,17 +194,17 @@ void CDHTStorage::put_mutable_item(sha1_hash const& target`
`194`	`194`	`CMutableData previousData;`
`195`	`195`	`if (!GetLocalMutableData(vchInfoHash, previousData)) {`
`196`	`196`	`if (PutLocalMutableData(vchInfoHash, putMutableData)) {`
`197`		`- LogPrint("dht", "CDHTStorage -- put_mutable_item added successfully\n");`
	`197`	`+ LogPrintf("CDHTStorage::%s added successfully\n", __func__);`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`	`else {`
`201`		`- if (putMutableData.Value() != previousData.Value() \|\| putMutableData.SequenceNumber != previousData.SequenceNumber) {`
	`201`	`+ if (putMutableData.SequenceNumber > previousData.SequenceNumber) {`
`202`	`202`	`if (UpdateLocalMutableData(vchInfoHash, putMutableData)) {`
`203`		`- LogPrint("dht", "CDHTStorage -- put_mutable_item updated successfully\n");`
	`203`	`+ LogPrintf("CDHTStorage::%s updated successfully\n", __func__);`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`	`else {`
`207`		`- LogPrint("dht", "CDHTStorage -- put_mutable_item value unchanged. No database operation needed.\n");`
	`207`	`+ LogPrintf("CDHTStorage::%s value unchanged. No database operation needed.\n", __func__);`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`// TODO: Log from address (addr). See touch_item in the default storage implementation.`