From ee67c64b766b91777ee990ff97928f255c1f4405 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 21 May 2014 09:26:17 -0700 Subject: [PATCH] stub sending of transactions to server --- domain-server/src/DomainServer.cpp | 24 ++++++++++++++++++++---- domain-server/src/DomainServer.h | 1 + domain-server/src/WalletTransaction.h | 1 + 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 5f9864f45b..ab1430fc29 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -59,11 +59,17 @@ DomainServer::DomainServer(int argc, char* argv[]) : _networkAccessManager = new QNetworkAccessManager(this); // setup a timer to send transactions to pay assigned nodes every 30 seconds - QTimer* nodePaymentTimer = new QTimer(this); - connect(nodePaymentTimer, &QTimer::timeout, this, &DomainServer::setupPendingAssignmentCredits); + QTimer* creditSetupTimer = new QTimer(this); + connect(creditSetupTimer, &QTimer::timeout, this, &DomainServer::setupPendingAssignmentCredits); - const qint64 CREDIT_CHECK_INTERVAL = 5 * 1000; - nodePaymentTimer->start(CREDIT_CHECK_INTERVAL); + const qint64 CREDIT_CHECK_INTERVAL_MSECS = 5 * 1000; + creditSetupTimer->start(CREDIT_CHECK_INTERVAL_MSECS); + + QTimer* nodePaymentTimer = new QTimer(this); + connect(nodePaymentTimer, &QTimer::timeout, this, &DomainServer::sendPendingTransactionsToServer); + + const qint64 TRANSACTION_SEND_INTERVAL_MSECS = 30 * 1000; + nodePaymentTimer->start(TRANSACTION_SEND_INTERVAL_MSECS); } } @@ -694,6 +700,16 @@ void DomainServer::setupPendingAssignmentCredits() { } } +void DomainServer::sendPendingTransactionsToServer() { + // enumerate the pending transactions and send them to the server to complete payment + TransactionHash::iterator i = _pendingAssignmentCredits.begin(); + + while (i != _pendingAssignmentCredits.end()) { + + ++i; + } +} + void DomainServer::processDatagram(const QByteArray& receivedPacket, const HifiSockAddr& senderSockAddr) { LimitedNodeList* nodeList = LimitedNodeList::getInstance(); diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h index cb011be16b..fc8806d53e 100644 --- a/domain-server/src/DomainServer.h +++ b/domain-server/src/DomainServer.h @@ -50,6 +50,7 @@ public slots: private slots: void readAvailableDatagrams(); void setupPendingAssignmentCredits(); + void sendPendingTransactionsToServer(); private: void setupNodeListAndAssignments(const QUuid& sessionUUID = QUuid::createUuid()); bool optionallySetupOAuth(); diff --git a/domain-server/src/WalletTransaction.h b/domain-server/src/WalletTransaction.h index f704042804..6c9708906d 100644 --- a/domain-server/src/WalletTransaction.h +++ b/domain-server/src/WalletTransaction.h @@ -30,6 +30,7 @@ public: void incrementAmount(double increment) { _amount += increment; } bool isFinalized() const { return _isFinalized; } + void setIsFinalized(bool isFinalized) { _isFinalized = isFinalized; } QJsonDocument postJson(); private: