Skip to content

Commit 7e74de3

Browse files
UdjinM6UdjinM6
authored
chore(qt): 19671 follow-up: drop zapwallettxes from gui (dashpay#4841)
1 parent 73cf7ff commit 7e74de3

File tree

3 files changed

+4
-100
lines changed

3 files changed

+4
-100
lines changed

‎src/qt/forms/debugwindow.ui‎

Lines changed: 4 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,49 +1428,11 @@
14281428
<string>Rescan blockchain files 2</string>
14291429
</property>
14301430
</widget>
1431-
<widget class="QPushButton" name="btn_zapwallettxes1">
1432-
<property name="geometry">
1433-
<rect>
1434-
<x>10</x>
1435-
<y>200</y>
1436-
<width>301</width>
1437-
<height>23</height>
1438-
</rect>
1439-
</property>
1440-
<property name="minimumSize">
1441-
<size>
1442-
<width>180</width>
1443-
<height>23</height>
1444-
</size>
1445-
</property>
1446-
<property name="text">
1447-
<string>Recover transactions 1</string>
1448-
</property>
1449-
</widget>
1450-
<widget class="QPushButton" name="btn_zapwallettxes2">
1451-
<property name="geometry">
1452-
<rect>
1453-
<x>10</x>
1454-
<y>250</y>
1455-
<width>301</width>
1456-
<height>23</height>
1457-
</rect>
1458-
</property>
1459-
<property name="minimumSize">
1460-
<size>
1461-
<width>180</width>
1462-
<height>23</height>
1463-
</size>
1464-
</property>
1465-
<property name="text">
1466-
<string>Recover transactions 2</string>
1467-
</property>
1468-
</widget>
14691431
<widget class="QPushButton" name="btn_upgradewallet">
14701432
<property name="geometry">
14711433
<rect>
14721434
<x>10</x>
1473-
<y>300</y>
1435+
<y>200</y>
14741436
<width>301</width>
14751437
<height>23</height>
14761438
</rect>
@@ -1533,43 +1495,11 @@
15331495
<bool>true</bool>
15341496
</property>
15351497
</widget>
1536-
<widget class="QLabel" name="label_repair_zap1">
1537-
<property name="geometry">
1538-
<rect>
1539-
<x>330</x>
1540-
<y>190</y>
1541-
<width>411</width>
1542-
<height>41</height>
1543-
</rect>
1544-
</property>
1545-
<property name="text">
1546-
<string>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</string>
1547-
</property>
1548-
<property name="wordWrap">
1549-
<bool>true</bool>
1550-
</property>
1551-
</widget>
1552-
<widget class="QLabel" name="label_repair_zap2">
1553-
<property name="geometry">
1554-
<rect>
1555-
<x>330</x>
1556-
<y>240</y>
1557-
<width>411</width>
1558-
<height>41</height>
1559-
</rect>
1560-
</property>
1561-
<property name="text">
1562-
<string>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</string>
1563-
</property>
1564-
<property name="wordWrap">
1565-
<bool>true</bool>
1566-
</property>
1567-
</widget>
15681498
<widget class="QLabel" name="label_repair_upgrade">
15691499
<property name="geometry">
15701500
<rect>
15711501
<x>330</x>
1572-
<y>290</y>
1502+
<y>190</y>
15731503
<width>411</width>
15741504
<height>41</height>
15751505
</rect>
@@ -1601,7 +1531,7 @@
16011531
<property name="geometry">
16021532
<rect>
16031533
<x>10</x>
1604-
<y>350</y>
1534+
<y>250</y>
16051535
<width>301</width>
16061536
<height>23</height>
16071537
</rect>
@@ -1614,7 +1544,7 @@
16141544
<property name="geometry">
16151545
<rect>
16161546
<x>330</x>
1617-
<y>340</y>
1547+
<y>240</y>
16181548
<width>411</width>
16191549
<height>41</height>
16201550
</rect>

‎src/qt/rpcconsole.cpp‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ const TrafficGraphData::GraphRange INITIAL_TRAFFIC_GRAPH_SETTING = TrafficGraphD
5656
// Repair parameters
5757
const QString RESCAN1("-rescan=1");
5858
const QString RESCAN2("-rescan=2");
59-
const QString ZAPTXES1("-zapwallettxes=1 -persistmempool=0");
60-
const QString ZAPTXES2("-zapwallettxes=2 -persistmempool=0");
6159
const QString UPGRADEWALLET("-upgradewallet");
6260
const QString REINDEX("-reindex");
6361

@@ -494,13 +492,9 @@ RPCConsole::RPCConsole(interfaces::Node& node, QWidget* parent, Qt::WindowFlags
494492
// Disable wallet repair options that require a wallet (enable them later when a wallet is added)
495493
ui->btn_rescan1->setEnabled(false);
496494
ui->btn_rescan2->setEnabled(false);
497-
ui->btn_zapwallettxes1->setEnabled(false);
498-
ui->btn_zapwallettxes2->setEnabled(false);
499495
ui->btn_upgradewallet->setEnabled(false);
500496
connect(ui->btn_rescan1, &QPushButton::clicked, this, &RPCConsole::walletRescan1);
501497
connect(ui->btn_rescan2, &QPushButton::clicked, this, &RPCConsole::walletRescan2);
502-
connect(ui->btn_zapwallettxes1, &QPushButton::clicked, this, &RPCConsole::walletZaptxes1);
503-
connect(ui->btn_zapwallettxes2, &QPushButton::clicked, this, &RPCConsole::walletZaptxes2);
504498
connect(ui->btn_upgradewallet, &QPushButton::clicked, this, &RPCConsole::walletUpgrade);
505499
connect(ui->btn_reindex, &QPushButton::clicked, this, &RPCConsole::walletReindex);
506500

@@ -736,8 +730,6 @@ void RPCConsole::addWallet(WalletModel * const walletModel)
736730
}
737731
ui->btn_rescan1->setEnabled(true);
738732
ui->btn_rescan2->setEnabled(true);
739-
ui->btn_zapwallettxes1->setEnabled(true);
740-
ui->btn_zapwallettxes2->setEnabled(true);
741733
ui->btn_upgradewallet->setEnabled(true);
742734
}
743735

@@ -751,8 +743,6 @@ void RPCConsole::removeWallet(WalletModel * const walletModel)
751743
if (ui->WalletSelector->count() == 1) {
752744
ui->btn_rescan1->setEnabled(false);
753745
ui->btn_rescan2->setEnabled(false);
754-
ui->btn_zapwallettxes1->setEnabled(false);
755-
ui->btn_zapwallettxes2->setEnabled(false);
756746
ui->btn_upgradewallet->setEnabled(false);
757747
}
758748
}
@@ -814,18 +804,6 @@ void RPCConsole::walletRescan2()
814804
buildParameterlist(RESCAN2);
815805
}
816806

817-
/** Restart wallet with "-zapwallettxes=1" */
818-
void RPCConsole::walletZaptxes1()
819-
{
820-
buildParameterlist(ZAPTXES1);
821-
}
822-
823-
/** Restart wallet with "-zapwallettxes=2" */
824-
void RPCConsole::walletZaptxes2()
825-
{
826-
buildParameterlist(ZAPTXES2);
827-
}
828-
829807
/** Restart wallet with "-upgradewallet" */
830808
void RPCConsole::walletUpgrade()
831809
{
@@ -857,8 +835,6 @@ void RPCConsole::buildParameterlist(QString arg)
857835
// Remove existing repair-options
858836
args.removeAll(RESCAN1);
859837
args.removeAll(RESCAN2);
860-
args.removeAll(ZAPTXES1);
861-
args.removeAll(ZAPTXES2);
862838
args.removeAll(UPGRADEWALLET);
863839
args.removeAll(REINDEX);
864840

‎src/qt/rpcconsole.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ public Q_SLOTS:
108108
/** Wallet repair options */
109109
void walletRescan1();
110110
void walletRescan2();
111-
void walletZaptxes1();
112-
void walletZaptxes2();
113111
void walletUpgrade();
114112
void walletReindex();
115113

0 commit comments

Comments
 (0)