From 50446619f5b5d39ed2551b0ea6f272a754decb1c Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 12 Oct 2017 11:59:46 -0700
Subject: [PATCH] Remove unnecessary (?) references to
 _recentlyDeletedEntityItemIDs

---
 libraries/entities/src/EntityTree.cpp | 30 ++++++++-------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index c4a22569d7..202d9f74b7 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1139,8 +1139,6 @@ void EntityTree::startChallengeOwnershipTimer(const EntityItemID& entityItemID)
     connect(_challengeOwnershipTimeoutTimer, &QTimer::timeout, this, [=]() {
         qCDebug(entities) << "Ownership challenge timed out, deleting entity" << entityItemID;
         deleteEntity(entityItemID, true);
-        QWriteLocker locker(&_recentlyDeletedEntitiesLock);
-        _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID);
         if (_challengeOwnershipTimeoutTimer) {
             _challengeOwnershipTimeoutTimer->stop();
             _challengeOwnershipTimeoutTimer->deleteLater();
@@ -1224,19 +1222,13 @@ void EntityTree::validatePop(const QString& certID, const EntityItemID& entityIt
             if (!jsonObject["invalid_reason"].toString().isEmpty()) {
                 qCDebug(entities) << "invalid_reason not empty, deleting entity" << entityItemID;
                 deleteEntity(entityItemID, true);
-                QWriteLocker locker(&_recentlyDeletedEntitiesLock);
-                _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID);
             } else if (jsonObject["transfer_status"].toString() == "failed") {
                 qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID;
                 deleteEntity(entityItemID, true);
-                QWriteLocker locker(&_recentlyDeletedEntitiesLock);
-                _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID);
             } else if (jsonObject["transfer_status"].toString() == "pending") {
                 if (isRetryingValidation) {
                     qCDebug(entities) << "'transfer_status' is 'pending' after retry, deleting entity" << entityItemID;
                     deleteEntity(entityItemID, true);
-                    QWriteLocker locker(&_recentlyDeletedEntitiesLock);
-                    _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID);
                 } else {
                     if (thread() != QThread::currentThread()) {
                         QMetaObject::invokeMethod(this, "startPendingTransferStatusTimer",
@@ -1281,8 +1273,6 @@ void EntityTree::validatePop(const QString& certID, const EntityItemID& entityIt
         } else {
             qCDebug(entities) << "Call to proof_of_purchase_status endpoint failed; deleting entity" << entityItemID;
             deleteEntity(entityItemID, true);
-            QWriteLocker locker(&_recentlyDeletedEntitiesLock);
-            _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID);
         }
 
         networkReply->deleteLater();
@@ -1299,21 +1289,21 @@ void EntityTree::processChallengeOwnershipPacket(ReceivedMessage& message, const
     QString certID(message.read(certIDByteArraySize));
     QString decryptedText(message.read(decryptedTextByteArraySize));
 
+    EntityItemID id;
+    {
+        QReadLocker certIdMapLocker(&_entityCertificateIDMapLock);
+        id = _entityCertificateIDMap.value(certID);
+    }
+
     emit killChallengeOwnershipTimeoutTimer(certID);
 
     if (!verifyDecryptedNonce(certID, decryptedText)) {
-        EntityItemID id;
-        {
-            QReadLocker certIdMapLocker(&_entityCertificateIDMapLock);
-            id = _entityCertificateIDMap.value(certID);
-        }
-        
         if (!id.isNull()) {
-            qCDebug(entities) << "Ownership challenge failed, deleting entity" << id;
+            qCDebug(entities) << "Ownership challenge for Cert ID" << certID << "failed; deleting entity" << id;
             deleteEntity(id, true);
-            QWriteLocker recentlyDeletedLocker(&_recentlyDeletedEntitiesLock);
-            _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), id);
         }
+    } else {
+        qCDebug(entities) << "Ownership challenge for Cert ID" << certID << "succeeded; keeping entity" << id;
     }
 }
 
@@ -1521,8 +1511,6 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
                                     << "static certificate verification.";
                                 // Delete the entity we just added if it doesn't pass static certificate verification
                                 deleteEntity(entityItemID, true);
-                                QWriteLocker locker(&_recentlyDeletedEntitiesLock);
-                                _recentlyDeletedEntityItemIDs.insert(usecTimestampNow(), entityItemID);
                             } else {
                                 validatePop(properties.getCertificateID(), entityItemID, senderNode, false);
                             }