stripping wallet/marketplace out

vircadia · Sep 6, 2020 · 14bf816 · 14bf816
1 parent 7a686d9
commit 14bf816
Show file tree

Hide file tree

Showing 190 changed files with 93 additions and 23,396 deletions.
diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
@@ -42,7 +42,7 @@ const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client";
 const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
 
 AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
-                                   quint16 listenPort, QUuid walletUUID, QString assignmentServerHostname,
+                                   quint16 listenPort, QString assignmentServerHostname,
                                    quint16 assignmentServerPort, quint16 assignmentMonitorPort) :
     _assignmentServerHostname(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME)
 {
@@ -68,13 +68,6 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
     // setup our _requestAssignment member variable from the passed arguments
     _requestAssignment = Assignment(Assignment::RequestCommand, requestAssignmentType, assignmentPool);
 
-    // check for a wallet UUID on the command line or in the config
-    // this would represent where the user running AC wants funds sent to
-    if (!walletUUID.isNull()) {
-        qCDebug(assignment_client) << "The destination wallet UUID for credits is" << uuidStringWithoutCurlyBraces(walletUUID);
-        _requestAssignment.setWalletUUID(walletUUID);
-    }
-
     // check for an overriden assignment server hostname
     if (assignmentServerHostname != "") {
         // change the hostname for our assignment server

diff --git a/assignment-client/src/AssignmentClient.h b/assignment-client/src/AssignmentClient.h
@@ -24,7 +24,7 @@ class AssignmentClient : public QObject {
 public:
     AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
                      quint16 listenPort,
-                     QUuid walletUUID, QString assignmentServerHostname, quint16 assignmentServerPort,
+                     QString assignmentServerHostname, quint16 assignmentServerPort,
                      quint16 assignmentMonitorPort);
     ~AssignmentClient();
 

diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
@@ -69,10 +69,6 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
                                                 "Minimum UDP listen port", "port");
     parser.addOption(minChildListenPort);
 
-    const QCommandLineOption walletDestinationOption(ASSIGNMENT_WALLET_DESTINATION_ID_OPTION,
-                                                     "set wallet destination", "wallet-uuid");
-    parser.addOption(walletDestinationOption);
-
     const QCommandLineOption assignmentServerHostnameOption(CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION,
                                                             "set assignment-server hostname", "hostname");
     parser.addOption(assignmentServerHostnameOption);
@@ -174,16 +170,8 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
         assignmentPool = parser.value(poolOption);
     }
 
-    QUuid walletUUID;
-    if (argumentVariantMap.contains(ASSIGNMENT_WALLET_DESTINATION_ID_OPTION)) {
-        walletUUID = argumentVariantMap.value(ASSIGNMENT_WALLET_DESTINATION_ID_OPTION).toString();
-    }
-    if (parser.isSet(walletDestinationOption)) {
-        walletUUID = parser.value(walletDestinationOption);
-    }
-
     QString assignmentServerHostname;
-    if (argumentVariantMap.contains(ASSIGNMENT_WALLET_DESTINATION_ID_OPTION)) {
+    if (argumentVariantMap.contains(CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION)) {
         assignmentServerHostname = argumentVariantMap.value(CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION).toString();
     }
     if (parser.isSet(assignmentServerHostnameOption)) {
@@ -192,7 +180,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
 
     // check for an overriden assignment server port
     quint16 assignmentServerPort = DEFAULT_DOMAIN_SERVER_PORT;
-    if (argumentVariantMap.contains(ASSIGNMENT_WALLET_DESTINATION_ID_OPTION)) {
+    if (argumentVariantMap.contains(CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION)) {
         assignmentServerPort = argumentVariantMap.value(CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION).toUInt();
     }
 
@@ -249,13 +237,13 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     if (numForks || minForks || maxForks) {
         AssignmentClientMonitor* monitor =  new AssignmentClientMonitor(numForks, minForks, maxForks,
                                                                         requestAssignmentType, assignmentPool, listenPort,
-                                                                        childMinListenPort, walletUUID, assignmentServerHostname,
+                                                                        childMinListenPort, assignmentServerHostname,
                                                                         assignmentServerPort, httpStatusPort, logDirectory);
         monitor->setParent(this);
         connect(this, &QCoreApplication::aboutToQuit, monitor, &AssignmentClientMonitor::aboutToQuit);
     } else {
         AssignmentClient* client = new AssignmentClient(requestAssignmentType, assignmentPool, listenPort,
-                                                        walletUUID, assignmentServerHostname,
+                                                        assignmentServerHostname,
                                                         assignmentServerPort, monitorPort);
         client->setParent(this);
         connect(this, &QCoreApplication::aboutToQuit, client, &AssignmentClient::aboutToQuit);

diff --git a/assignment-client/src/AssignmentClientApp.h b/assignment-client/src/AssignmentClientApp.h
@@ -18,7 +18,6 @@
 const QString ASSIGNMENT_TYPE_OVERRIDE_OPTION = "t";
 const QString ASSIGNMENT_POOL_OPTION = "pool";
 const QString ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION = "p";
-const QString ASSIGNMENT_WALLET_DESTINATION_ID_OPTION = "wallet";
 const QString CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION = "a";
 const QString ASSIGNMENT_MONITOR_MIN_CHILDREN_LISTEN_PORT_OPTION = "min-listen-port";
 const QString CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION = "server-port";

diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -40,15 +40,14 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen
                                                  const unsigned int minAssignmentClientForks,
                                                  const unsigned int maxAssignmentClientForks,
                                                  Assignment::Type requestAssignmentType, QString assignmentPool,
-                                                 quint16 listenPort, quint16 childMinListenPort, QUuid walletUUID, QString assignmentServerHostname,
+                                                 quint16 listenPort, quint16 childMinListenPort, QString assignmentServerHostname,
                                                  quint16 assignmentServerPort, quint16 httpStatusServerPort, QString logDirectory) :
     _httpManager(QHostAddress::LocalHost, httpStatusServerPort, "", this),
     _numAssignmentClientForks(numAssignmentClientForks),
     _minAssignmentClientForks(minAssignmentClientForks),
     _maxAssignmentClientForks(maxAssignmentClientForks),
     _requestAssignmentType(requestAssignmentType),
     _assignmentPool(assignmentPool),
-    _walletUUID(walletUUID),
     _assignmentServerHostname(assignmentServerHostname),
     _assignmentServerPort(assignmentServerPort),
     _childMinListenPort(childMinListenPort)
@@ -181,10 +180,6 @@ void AssignmentClientMonitor::spawnChildClient() {
         _childArguments.append("--" + ASSIGNMENT_POOL_OPTION);
         _childArguments.append(_assignmentPool);
     }
-    if (!_walletUUID.isNull()) {
-        _childArguments.append("--" + ASSIGNMENT_WALLET_DESTINATION_ID_OPTION);
-        _childArguments.append(_walletUUID.toString());
-    }
     if (_assignmentServerHostname != "") {
         _childArguments.append("--" + CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION);
         _childArguments.append(_assignmentServerHostname);

diff --git a/assignment-client/src/AssignmentClientMonitor.h b/assignment-client/src/AssignmentClientMonitor.h
@@ -37,7 +37,7 @@ class AssignmentClientMonitor : public QObject, public HTTPRequestHandler {
 public:
     AssignmentClientMonitor(const unsigned int numAssignmentClientForks, const unsigned int minAssignmentClientForks,
                             const unsigned int maxAssignmentClientForks, Assignment::Type requestAssignmentType,
-                            QString assignmentPool, quint16 listenPort, quint16 childMinListenPort, QUuid walletUUID,
+                            QString assignmentPool, quint16 listenPort, quint16 childMinListenPort,
                             QString assignmentServerHostname, quint16 assignmentServerPort, quint16 httpStatusServerPort,
                             QString logDirectory);
     ~AssignmentClientMonitor();
@@ -70,7 +70,6 @@ public slots:
 
     Assignment::Type _requestAssignmentType;
     QString _assignmentPool;
-    QUuid _walletUUID;
     QString _assignmentServerHostname;
     quint16 _assignmentServerPort;
 

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -83,7 +83,6 @@ AvatarMixer::AvatarMixer(ReceivedMessage& message) :
     packetReceiver.registerListener(PacketType::BulkAvatarTraitsAck, this, "queueIncomingPacket");
     packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
         this, "handleOctreePacket");
-    packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "queueIncomingPacket");
 
     packetReceiver.registerListenerForTypes({
         PacketType::ReplicatedAvatarIdentity,
@@ -499,8 +498,6 @@ void AvatarMixer::handleAvatarKilled(SharedNodePointer avatarNode) {
            } else {
                _sessionDisplayNames.erase(displayNameIter);
            }
-
-            nodeData->getAvatar().stopChallengeTimer();
         }
 
         std::unique_ptr<NLPacket> killPacket;

diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -73,20 +73,13 @@ int AvatarMixerClientData::processPackets(const SlaveSharedData& slaveSharedData
             case PacketType::BulkAvatarTraitsAck:
                 processBulkAvatarTraitsAckMessage(*packet);
                 break;
-            case PacketType::ChallengeOwnership:
-                _avatar->processChallengeResponse(*packet);
-                break;
             default:
                 Q_UNREACHABLE();
         }
         _packetQueue.pop();
     }
     assert(_packetQueue.empty());
 
-    if (_avatar) {
-        _avatar->processCertifyEvents();
-    }
-
     return packetsProcessed;
 }
 
@@ -230,8 +223,6 @@ void AvatarMixerClientData::processSetTraitsMessage(ReceivedMessage& message,
                 if (traitType == AvatarTraits::SkeletonModelURL) {
                     // special handling for skeleton model URL, since we need to make sure it is in the whitelist
                     checkSkeletonURLAgainstWhitelist(slaveSharedData, sendingNode, packetTraitVersion);
-                    // Deferred for UX work. With no PoP check, no need to get the .fst.
-                    _avatar->fetchAvatarFST();
                 }
 
                 anyTraitsChanged = true;