Browse Source

[Qt] paymentserver: start netManager in uiReady()

- remove explicit init of netManager as this is done in the constructor
  anyway
- move initNetManager() call to uiReady(), which removes an assert() and
  allows us to use message() in initNetManager() (currently unused but
  could be necessary because of proxy related messages)
- make initNetManager() private
- update paymentservertests.cpp
pull/1/head
Philip Kaufmann 9 years ago
parent
commit
7634e0d8de
  1. 1
      src/qt/bitcoin.cpp
  2. 2
      src/qt/paymentserver.cpp
  3. 6
      src/qt/paymentserver.h
  4. 1
      src/qt/test/paymentservertests.cpp

1
src/qt/bitcoin.cpp

@ -308,7 +308,6 @@ int main(int argc, char *argv[]) @@ -308,7 +308,6 @@ int main(int argc, char *argv[])
PaymentServer::LoadRootCAs();
paymentServer->setOptionsModel(&optionsModel);
paymentServer->initNetManager();
if (splashref)
splash.finish(&window);

2
src/qt/paymentserver.cpp

@ -341,7 +341,7 @@ void PaymentServer::initNetManager() @@ -341,7 +341,7 @@ void PaymentServer::initNetManager()
void PaymentServer::uiReady()
{
assert(netManager != NULL); // Must call initNetManager before uiReady()
initNetManager();
saveURIs = false;
foreach (const QString& s, savedPaymentRequests)

6
src/qt/paymentserver.h

@ -77,9 +77,6 @@ public: @@ -77,9 +77,6 @@ public:
// Return certificate store
static X509_STORE* getCertStore() { return certStore; }
// Setup networking
void initNetManager();
// Constructor registers this on the parent QApplication to
// receive QEvent::FileOpen events
bool eventFilter(QObject *object, QEvent *event);
@ -117,6 +114,9 @@ private: @@ -117,6 +114,9 @@ private:
void handleURIOrFile(const QString& s);
void fetchRequest(const QUrl& url);
// Setup networking
void initNetManager();
bool saveURIs; // true during startup
QLocalServer* uriServer;

1
src/qt/test/paymentservertests.cpp

@ -60,7 +60,6 @@ void PaymentServerTests::paymentServerTests() @@ -60,7 +60,6 @@ void PaymentServerTests::paymentServerTests()
X509_STORE_add_cert(caStore, parse_b64der_cert(caCert_BASE64));
PaymentServer::LoadRootCAs(caStore);
server->setOptionsModel(&optionsModel);
server->initNetManager();
server->uiReady();
// Now feed PaymentRequests to server, and observe signals it produces:

Loading…
Cancel
Save