From abe1cd1b51bba38d6a5e5ed7a5015b15dc77c0b9 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 12 Oct 2017 11:40:47 -0700
Subject: [PATCH] Minor cleanup

---
 assignment-client/src/entities/EntityServer.cpp | 7 +++----
 interface/src/commerce/Wallet.cpp               | 4 ----
 libraries/entities/src/EntityTree.cpp           | 4 ----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index 1dc1eef593..0b27cfa408 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -442,8 +442,7 @@ void EntityServer::domainSettingsRequestFailed() {
 void EntityServer::startDynamicDomainVerification() {
     qCDebug(entities) << "Starting Dynamic Domain Verification...";
 
-    auto nodeList = DependencyManager::get<NodeList>();
-    QString thisDomainID = nodeList->getDomainHandler().getUUID().toString();
+    QString thisPlaceName = DependencyManager::get<AddressManager>()->currentAddress().authority();
 
     EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
     QHash<QString, EntityItemID> localMap(tree->getEntityCertificateIDMap());
@@ -485,9 +484,9 @@ void EntityServer::startDynamicDomainVerification() {
 
                 if (networkReply->error() == QNetworkReply::NoError) {
                     // ZRF FIXME!!!
-                    //if (jsonObject["location"].toString() != thisDomainID) {
+                    //if (jsonObject["place_name"].toString() != thisPlaceName) {
                     if (false) {
-                        qCDebug(entities) << "invalid_reason not empty, deleting entity" << i.value();
+                        qCDebug(entities) << "Entity's cert's place name isn't the current place name; deleting entity" << i.value();
                         tree->deleteEntity(i.value(), true);
                     }
                 } else {
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index fcb287c2d6..74f5e700f6 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -734,10 +734,6 @@ void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> pack
             rsa,
             RSA_PKCS1_OAEP_PADDING);
 
-        long error = ERR_get_error();
-        const char* error_str = ERR_error_string(error, NULL);
-        qDebug() << "ZRF HERE\n\nEncrypted Text:" << encryptedText << "\nEncrypted Text ByteArray Size:" << encryptedTextByteArraySize << "\nEncrypted Text Length:" << encryptedText.length() << "\nDecrypted Text:" << decryptedText << "\nError:" << error_str;
-
         RSA_free(rsa);
 
         if (decryptionStatus != -1) {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 9a2048211f..c4a22569d7 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1182,8 +1182,6 @@ QByteArray EntityTree::computeEncryptedNonce(const QString& certID, const QStrin
         QWriteLocker locker(&_certNonceMapLock);
         _certNonceMap.insert(certID, nonce);
 
-        qDebug() << "ZRF HERE\n\nEncrypted Text:" << encryptedText << "\nEncrypted Text Length:" << encryptedText.length();
-
         return encryptedText;
     } else {
         return "";
@@ -1301,8 +1299,6 @@ void EntityTree::processChallengeOwnershipPacket(ReceivedMessage& message, const
     QString certID(message.read(certIDByteArraySize));
     QString decryptedText(message.read(decryptedTextByteArraySize));
 
-    qCDebug(entities) << "ZRF FIXME FJAOPISEJFPAOISEJFOA" << decryptedText << certID;
-
     emit killChallengeOwnershipTimeoutTimer(certID);
 
     if (!verifyDecryptedNonce(certID, decryptedText)) {