Align desktop history reads with Merkle schema and fix PM test setup

tools/chatgui/tests/test_dm_deletion.cpp

@@ -16,6 +16,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QMenu>
+#include <QScopeGuard>
 #include <future>
 #include <memory>
 extern "C" {
@@ -63,9 +64,17 @@ private slots:
 
     void deleteThroughWindowAndCore() {
         QTemporaryDir directory; QVERIFY(directory.isValid());
+        directory.setAutoRemove(false);
+        auto diagnostics = qScopeGuard([&directory] {
+            directory.setAutoRemove(!QTest::currentTestFailed());
+            if (QTest::currentTestFailed()) DEBUG_ERROR(DEBUG_CATEGORY_DEBUG, "DM test diagnostics retained: %s", qPrintable(directory.path()));
+        });
         const QString configPath = directory.filePath("node.cfg");
         QFile config(configPath); QVERIFY(config.open(QIODevice::WriteOnly));
-        const QByteArray text = "[global]\ntun_enabled=no\n[server:local]\naddr=127.0.0.1:0\ntype=private\n"
+        const QByteArray text = "[global]\n"
+            "my_private_key=704f2e012c8fa8768130cb0f988a997dccb628372bc5ceccacc78dcbfec5916f\n"
+            "my_public_key=b3193173def895bd0fcea6f86af077c7d77216f10395275f627ac18242ec0f01\n"
+            "tun_enabled=no\n[server:local]\naddr=127.0.0.1:0\ntype=private\n"
             "[chatserver]\ngroup_autoconnect=0\nstorage_autoload=0\nlocal_invites_enabled=0\nlocal_broadcasts_enabled=0\n"
             "[ntp]\nenabled=no\n";
         QCOMPARE(config.write(text), text.size()); config.close();