Have -disablewallet remove all walletmodels and validate node-only mode with a functional test

.github/workflows/gui-functional-tests.yml

@@ -55,6 +55,7 @@ jobs:
         run: |
           python3 test/functional/qml_test_bridge_sanity.py
           python3 test/functional/qml_test_onboarding.py
+          python3 test/functional/qml_test_disablewallet_boot.py
           python3 test/functional/qml_test_external_signer.py
           python3 test/functional/qml_test_peers.py
           python3 test/functional/qml_test_proxy.py

qml/bitcoin.cpp

@@ -294,18 +294,26 @@ int QmlGuiMain(int argc, char* argv[])
 
     handler_message_box.disconnect();
 
+    AppMode app_mode = SetupAppMode();
+#ifdef ENABLE_WALLET
+    const bool wallet_enabled = app_mode.walletEnabled();
+#endif
+
     NodeModel node_model{*node};
     QmlInitExecutor init_executor{*node};
 #ifdef ENABLE_WALLET
-    WalletQmlController wallet_controller(*node);
-    if (!gArgs.GetBoolArg("-disablewallet", false)) {
-        QObject::connect(&init_executor, &QmlInitExecutor::initializeResult, &wallet_controller, &WalletQmlController::initialize);
+    std::unique_ptr<WalletQmlController> wallet_controller;
+    if (wallet_enabled) {
+        wallet_controller = std::make_unique<WalletQmlController>(*node);
+        QObject::connect(&init_executor, &QmlInitExecutor::initializeResult, wallet_controller.get(), &WalletQmlController::initialize);
     }
 #endif
     QObject::connect(&node_model, &NodeModel::requestedInitialize, &init_executor, &QmlInitExecutor::initialize);
     QObject::connect(&node_model, &NodeModel::requestedShutdown, [&] {
 #ifdef ENABLE_WALLET
-        wallet_controller.unloadWallets();
+        if (wallet_controller) {
+            wallet_controller->unloadWallets();
+        }
 #endif
         init_executor.shutdown();
     });
@@ -329,7 +337,9 @@ int QmlGuiMain(int argc, char* argv[])
     qGuiApp->setQuitOnLastWindowClosed(false);
     QObject::connect(qGuiApp, &QGuiApplication::lastWindowClosed, [&] {
 #ifdef ENABLE_WALLET
-        wallet_controller.unloadWallets();
+        if (wallet_controller) {
+            wallet_controller->unloadWallets();
+        }
 #endif
         node->startShutdown();
     });
@@ -366,9 +376,12 @@ int QmlGuiMain(int argc, char* argv[])
     engine.rootContext()->setContextProperty("debugLogModel", &debug_log_model);
 
 #ifdef ENABLE_WALLET
-    WalletListModel wallet_list_model{*node, nullptr};
-    engine.rootContext()->setContextProperty("walletController", &wallet_controller);
-    engine.rootContext()->setContextProperty("walletListModel", &wallet_list_model);
+    std::unique_ptr<WalletListModel> wallet_list_model;
+    if (wallet_enabled) {
+        wallet_list_model = std::make_unique<WalletListModel>(*node, nullptr);
+        engine.rootContext()->setContextProperty("walletController", wallet_controller.get());
+        engine.rootContext()->setContextProperty("walletListModel", wallet_list_model.get());
+    }
 #endif
 
     OptionsQmlModel options_model(*node, !need_onboarding.toBool());
@@ -396,7 +409,6 @@ int QmlGuiMain(int argc, char* argv[])
         engine.retranslate();
     });
 
-    AppMode app_mode = SetupAppMode();
     BuildInfo build_info;
     Clipboard clipboard;
 

qml/pages/node/NetworkTraffic.qml

@@ -20,6 +20,7 @@ InformationPage {
         property alias trafficGraphScale: root.trafficGraphScale
     }
     navLeftDetail: NavButton {
+        objectName: "networkTrafficBackButton"
         iconSource: "image://images/caret-left"
         text: qsTr("Back")
         onClicked: root.back()

qml/pages/node/NodeSettings.qml

@@ -42,6 +42,7 @@ PageStack {
             }
             rightItem: NavButton {
                 id: doneButton
+                objectName: "nodeSettingsDoneButton"
                 text: qsTr("Done")
                 onClicked: root.doneClicked()
             }
@@ -82,6 +83,7 @@ PageStack {
                 Separator { Layout.fillWidth: true }
                 Setting {
                     id: gotoStorage
+                    objectName: "gotoStorage"
                     Layout.fillWidth: true
                     header: qsTr("Storage")
                     actionItem: CaretRightIcon {
@@ -138,6 +140,7 @@ PageStack {
                 Separator { Layout.fillWidth: true }
                 Setting {
                     id: gotoNetworkTraffic
+                    objectName: "settingsNetworkTraffic"
                     Layout.fillWidth: true
                     header: qsTr("Network Traffic")
                     actionItem: CaretRightIcon {

qml/pages/node/Peers.qml

@@ -21,6 +21,7 @@ Page {
 
     header: NavigationBar2 {
         leftItem: NavButton {
+            objectName: "peersBackButton"
             iconSource: "image://images/caret-left"
             text: qsTr("Back")
             onClicked: root.back()

qml/pages/settings/SettingsAbout.qml

@@ -47,6 +47,7 @@ InformationPage {
     Component {
         id: backButton
         NavButton {
+            objectName: "settingsAboutBack"
             iconSource: "image://images/caret-left"
             text: qsTr("Back")
             onClicked: root.back()

qml/pages/settings/SettingsConnection.qml

@@ -58,6 +58,7 @@ Page {
                 Component {
                     id: backButton
                     NavButton {
+                        objectName: "settingsConnectionBack"
                         iconSource: "image://images/caret-left"
                         text: qsTr("Back")
                         onClicked: root.back()

qml/pages/settings/SettingsDeveloper.qml

@@ -13,6 +13,7 @@ InformationPage {
     objectName: "settingsDeveloper"
     property bool onboarding: false
     navLeftDetail: NavButton {
+        objectName: "settingsDeveloperBack"
         iconSource: "image://images/caret-left"
         text: qsTr("Back")
         onClicked: {

qml/pages/settings/SettingsDisplay.qml

@@ -27,6 +27,7 @@ Item {
 
             header: NavigationBar2 {
                 leftItem: NavButton {
+                    objectName: "settingsDisplayBack"
                     iconSource: "image://images/caret-left"
                     text: qsTr("Back")
                     onClicked: root.back()

qml/pages/settings/SettingsStorage.qml

@@ -52,6 +52,7 @@ InformationPage {
     Component {
         id: backButton
         NavButton {
+            objectName: "settingsStorageBack"
             iconSource: "image://images/caret-left"
             text: qsTr("Back")
             onClicked: root.back()

qml/test/testbridge.cpp

@@ -14,6 +14,7 @@
 #include <QPointer>
 #include <QQuickItem>
 #include <QQuickWindow>
+#include <QQmlContext>
 #include <QScopedValueRollback>
 #include <QTimer>
 #include <QVariant>
@@ -375,6 +376,8 @@ QByteArray TestBridge::processCommand(const QByteArray& json_cmd)
 
     if (cmd == QLatin1String("get_current_page")) {
         return cmdGetCurrentPage();
+    } else if (cmd == QLatin1String("get_context_property")) {
+        return cmdGetContextProperty(obj.value(QStringLiteral("name")).toString());
     } else if (cmd == QLatin1String("get_property")) {
         return cmdGetProperty(
             obj.value(QStringLiteral("objectName")).toString(),
@@ -457,6 +460,34 @@ QByteArray TestBridge::cmdGetCurrentPage()
     return errorResponse(QStringLiteral("Could not determine current page; missing mainPageStack/current page item"));
 }
 
+QByteArray TestBridge::cmdGetContextProperty(const QString& name)
+{
+    if (name.isEmpty()) {
+        return errorResponse(QStringLiteral("name is required"));
+    }
+
+    QVariant value = m_engine->rootContext()->contextProperty(name);
+    const bool exists = value.isValid() && !value.isNull();
+
+    QJsonObject resp;
+    resp[QStringLiteral("exists")] = exists;
+    if (!exists) {
+        return QJsonDocument(resp).toJson(QJsonDocument::Compact);
+    }
+
+    if (QObject* object = value.value<QObject*>()) {
+        resp[QStringLiteral("isQObject")] = true;
+        resp[QStringLiteral("className")] = QString::fromLatin1(object->metaObject()->className());
+        resp[QStringLiteral("objectName")] = object->objectName();
+    } else {
+        resp[QStringLiteral("isQObject")] = false;
+        resp[QStringLiteral("typeName")] = QString::fromLatin1(value.typeName());
+        resp[QStringLiteral("value")] = QJsonValue::fromVariant(value);
+    }
+
+    return QJsonDocument(resp).toJson(QJsonDocument::Compact);
+}
+
 QByteArray TestBridge::cmdGetProperty(const QString& object_name, const QString& prop)
 {
     if (object_name.isEmpty() || prop.isEmpty()) {

qml/test/testbridge.h

@@ -23,6 +23,7 @@
 ///
 /// Supported commands (JSON over newline-delimited stream):
 ///   {"cmd": "get_current_page"}
+///   {"cmd": "get_context_property", "name": "<contextPropertyName>"}
 ///   {"cmd": "get_property", "objectName": "<name>", "prop": "<property>"}
 ///   {"cmd": "click", "objectName": "<name>"}
 ///   {"cmd": "set_text", "objectName": "<name>", "text": "<value>"}
@@ -70,6 +71,7 @@ private Q_SLOTS:
 
     /// Dispatch individual command handlers.
     QByteArray cmdGetCurrentPage();
+    QByteArray cmdGetContextProperty(const QString& name);
     QByteArray cmdGetProperty(const QString& object_name, const QString& prop);
     QByteArray cmdClick(const QString& object_name);
     QByteArray cmdSetText(const QString& object_name, const QString& text);

test/functional/qml_driver.py

@@ -198,6 +198,15 @@ def list_objects(self):
             raise QmlDriverError(f"list_objects failed: {resp['error']}")
         return resp["objects"]
 
+    def get_context_property(self, name):
+        """Return metadata for a QQmlEngine root context property."""
+        resp = self._send({"cmd": "get_context_property", "name": name})
+        if "error" in resp:
+            raise QmlDriverError(
+                f"get_context_property({name!r}) failed: {resp['error']}"
+            )
+        return resp
+
     def save_screenshot(self, path):
         """Save a screenshot of the current QML window to a PNG file.